summaryrefslogtreecommitdiff
path: root/clrdefinitions.cmake
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-04-27 16:35:21 -0700
committerGaurav Khanna <gkhanna@microsoft.com>2016-04-28 12:11:06 -0700
commit2385b697ea4eeaa7314fafd32415e943601211cf (patch)
tree26b3c525819e33f0cbd0cd79fa5e57df938779c6 /clrdefinitions.cmake
parentccbabf30d4d9bde05e9a843713b29542279cd92a (diff)
downloadcoreclr-2385b697ea4eeaa7314fafd32415e943601211cf.tar.gz
coreclr-2385b697ea4eeaa7314fafd32415e943601211cf.tar.bz2
coreclr-2385b697ea4eeaa7314fafd32415e943601211cf.zip
Load JIT from a custom location
Diffstat (limited to 'clrdefinitions.cmake')
-rw-r--r--clrdefinitions.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index d0d07a2b62..bc39e108c4 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -132,7 +132,9 @@ 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.
-set(FEATURE_MERGE_JIT_AND_ENGINE 1)
+if(NOT WIN32)
+ set(FEATURE_MERGE_JIT_AND_ENGINE 1)
+endif(NOT WIN32)
if(FEATURE_MERGE_JIT_AND_ENGINE)
# Disable the following for UNIX altjit on Windows
add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE)