diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2016-05-05 17:12:20 -0700 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2016-05-10 12:44:23 -0700 |
| commit | 312643c85a7f371414fd4dca1a13b9631a538498 (patch) | |
| tree | 5834403f7167aa91502f7b66e106b5646b44b8e7 /clrdefinitions.cmake | |
| parent | ad2485b93ce14437c0dc8b4fb69b0a54177fe09f (diff) | |
| download | coreclr-312643c85a7f371414fd4dca1a13b9631a538498.tar.gz coreclr-312643c85a7f371414fd4dca1a13b9631a538498.tar.bz2 coreclr-312643c85a7f371414fd4dca1a13b9631a538498.zip | |
Disable FEATURE_MERGE_JIT_AND_ENGINE on *nix.
Now that #3058 has been fixed, the JIT can be consumed as a dynamic
library on all platforms.
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 7 |
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 |