aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Farnung <kfarnung@microsoft.com>2018-10-01 09:57:56 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-10-01 09:57:56 -0700
commitf9122d3aa24f6b2250876a8fdee69754c640d333 (patch)
tree7ed289fc62debb3b2f5cd364336283e2491a7273
parentd31c063fb92e936297e12fcc086550dcef8c31d8 (diff)
downloadvcpkg-f9122d3aa24f6b2250876a8fdee69754c640d333.tar.gz
vcpkg-f9122d3aa24f6b2250876a8fdee69754c640d333.zip
Force ChakraCore to statically link the CRT (#4371)
ChakraCore can only dynamically link against MSVCRT currently. To work around this it's best just to statically link the CRT like official builds do. Refs: https://github.com/Microsoft/ChakraCore/issues/5725
-rw-r--r--ports/chakracore/CONTROL2
-rw-r--r--ports/chakracore/portfile.cmake5
2 files changed, 2 insertions, 5 deletions
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index 727f28268..cc29aa2d5 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,3 +1,3 @@
Source: chakracore
-Version: 1.11.1
+Version: 1.11.1-1
Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index 62801f00a..3d7b2630d 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -24,10 +24,7 @@ set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
file(REMOVE_RECURSE ${BUILDTREE_PATH})
file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH})
-set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore default is static CRT linkage
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
- set(CHAKRA_RUNTIME_LIB "dynamic_library")
-endif()
+set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage
vcpkg_build_msbuild(
PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln