summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-04-26 11:22:49 -0700
committerGaurav Khanna <gkhanna@microsoft.com>2016-04-26 11:22:49 -0700
commit52226b2685ef7afc8fbdda90aef282e109449111 (patch)
tree75b6db682f8c39cafdad41d69eef850d0074e9c9 /src/tools
parentf9744f6d7e0b31edf53e7079ddef8ef6115f2736 (diff)
parent140396f479d5d33bca0daef1f072eef4992ed78e (diff)
downloadcoreclr-52226b2685ef7afc8fbdda90aef282e109449111.tar.gz
coreclr-52226b2685ef7afc8fbdda90aef282e109449111.tar.bz2
coreclr-52226b2685ef7afc8fbdda90aef282e109449111.zip
Merge pull request #4528 from gkhanna79/DynamicJITLoad
Refactor FEATURE_MERGE_JIT_AND_ENGINE to allow consuming JIT as a dynamic library
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 f16c188c3c..150a35364d 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