diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-22 12:24:51 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 08:08:20 -0700 |
| commit | 140396f479d5d33bca0daef1f072eef4992ed78e (patch) | |
| tree | 691bb2faa922940c1de7363fd51ac109495e6473 /clrdefinitions.cmake | |
| parent | b0d809bd6ae65e85591af504e1797b115ea25b23 (diff) | |
| download | coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.gz coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.bz2 coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.zip | |
Keep FEATURE_MERGE_JIT_AND_ENGINE with refactored approach
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 5c9c3d0a33..39b35ed410 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -130,10 +130,13 @@ add_definitions(-DFEATURE_MANAGED_ETW) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) -if(WIN32) -# Disable the following for UNIX altjit on Windows -add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) -endif(WIN32) + +# TODO_DJIT: Remove this "set" to commence loading JIT dynamically. +set(FEATURE_MERGE_JIT_AND_ENGINE 1) +if(FEATURE_MERGE_JIT_AND_ENGINE) + # Disable the following for UNIX altjit on Windows + add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) +endif(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MULTICOREJIT) add_definitions(-DFEATURE_NORM_IDNA_ONLY) if(CLR_CMAKE_PLATFORM_UNIX) |