summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--clrdefinitions.cmake7
1 files changed, 2 insertions, 5 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index 8345e4d4c9..0b34e57d37 100644
--- a/clrdefinitions.cmake
+++ b/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