diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-29 08:00:17 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-05-02 08:55:22 -0700 |
| commit | 9dc862d0b7fbb31c150501f6d11dfe81bbfa673c (patch) | |
| tree | d5974cec9f217d34a369161045eac351fe4c4052 /clrdefinitions.cmake | |
| parent | e18a26aabee632497cbf4be6258c3c930d004824 (diff) | |
| download | coreclr-9dc862d0b7fbb31c150501f6d11dfe81bbfa673c.tar.gz coreclr-9dc862d0b7fbb31c150501f6d11dfe81bbfa673c.tar.bz2 coreclr-9dc862d0b7fbb31c150501f6d11dfe81bbfa673c.zip | |
Enable crossgen to load JIT from a custom location
Continue to link the JIT in for Windows Arm64 builds until 4717 is fixed.
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index c5352c0482..58b9ad24c1 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -134,7 +134,11 @@ 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) + # TODO_DJIT: Remove this as part of enabling cross-compiling standalone JIT binary. + 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) |