From 140396f479d5d33bca0daef1f072eef4992ed78e Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Fri, 22 Apr 2016 12:24:51 -0700 Subject: Keep FEATURE_MERGE_JIT_AND_ENGINE with refactored approach --- src/tools/crossgen/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/tools') 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 -- cgit v1.2.3