From f9122d3aa24f6b2250876a8fdee69754c640d333 Mon Sep 17 00:00:00 2001 From: Kyle Farnung Date: Mon, 1 Oct 2018 09:57:56 -0700 Subject: [PATCH] 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 --- ports/chakracore/CONTROL | 2 +- ports/chakracore/portfile.cmake | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 727f282685..cc29aa2d5c 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 62801f00ae..3d7b2630df 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