From f97f034715ea20c68c8257c76a93ed408cec3bd8 Mon Sep 17 00:00:00 2001 From: Pat Gavlin Date: Thu, 5 May 2016 17:12:20 -0700 Subject: [PATCH] Disable FEATURE_MERGE_JIT_AND_ENGINE on *nix. Now that dotnet/coreclr#3058 has been fixed, the JIT can be consumed as a dynamic library on all platforms. Commit migrated from https://github.com/dotnet/coreclr/commit/312643c85a7f371414fd4dca1a13b9631a538498 --- src/coreclr/clrdefinitions.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 8345e4d..0b34e57 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -132,13 +132,10 @@ add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) -# TODO_DJIT: Remove this "set" to commence loading JIT dynamically. -if(NOT WIN32) - set(FEATURE_MERGE_JIT_AND_ENGINE 1) -elseif (CLR_CMAKE_TARGET_ARCH_ARM64) +if(CLR_CMAKE_TARGET_ARCH_ARM64) # TODO_DJIT: Remove this as part of enabling cross-compiling standalone JIT binary. set(FEATURE_MERGE_JIT_AND_ENGINE 1) -endif(NOT WIN32) +endif(CLR_CMAKE_TARGET_ARCH_ARM64) if(FEATURE_MERGE_JIT_AND_ENGINE) # Disable the following for UNIX altjit on Windows -- 2.7.4