summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-04-22 19:24:51 (GMT)
committerGaurav Khanna <gkhanna@microsoft.com>2016-04-26 15:08:20 (GMT)
commit140396f479d5d33bca0daef1f072eef4992ed78e (patch)
tree691bb2faa922940c1de7363fd51ac109495e6473 /src/tools
parentb0d809bd6ae65e85591af504e1797b115ea25b23 (diff)
downloadcoreclr-140396f479d5d33bca0daef1f072eef4992ed78e.zip
coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.gz
coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.bz2
Keep FEATURE_MERGE_JIT_AND_ENGINE with refactored approach
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/crossgen/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/crossgen/CMakeLists.txt b/src/tools/crossgen/CMakeLists.txt
index f16c188..150a353 100644
--- a/src/tools/crossgen/CMakeLists.txt
+++ b/src/tools/crossgen/CMakeLists.txt
@@ -24,6 +24,10 @@ add_executable_clr(crossgen
${crossgen_RESOURCES}
)
+if(FEATURE_MERGE_JIT_AND_ENGINE)
+ set(CLRJIT_CROSSGEN clrjit_crossgen)
+endif(FEATURE_MERGE_JIT_AND_ENGINE)
+
target_link_libraries(crossgen
cee_crossgen
mdcompiler_crossgen
@@ -31,7 +35,7 @@ target_link_libraries(crossgen
mdruntimerw_crossgen
mdhotdata_crossgen
corguids
- clrjit_crossgen
+ ${CLRJIT_CROSSGEN}
gcinfo_crossgen
corzap_crossgen
mscorlib_crossgen