diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 11:22:49 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 11:22:49 -0700 |
| commit | 52226b2685ef7afc8fbdda90aef282e109449111 (patch) | |
| tree | 75b6db682f8c39cafdad41d69eef850d0074e9c9 /src/dlls | |
| parent | f9744f6d7e0b31edf53e7079ddef8ef6115f2736 (diff) | |
| parent | 140396f479d5d33bca0daef1f072eef4992ed78e (diff) | |
| download | coreclr-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/dlls')
| -rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index 6c2e50ad3a..42a3bc6550 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -65,6 +65,10 @@ if (CLR_CMAKE_PLATFORM_UNIX) set(LIB_UNWINDER unwinder_wks) endif (CLR_CMAKE_PLATFORM_UNIX) +if(FEATURE_MERGE_JIT_AND_ENGINE) + set(CLRJIT_STATIC clrjit_static) +endif(FEATURE_MERGE_JIT_AND_ENGINE) + # IMPORTANT! Please do not rearrange the order of the libraries. The linker on Linux is # order dependent and changing the order can result in undefined symbols in the shared # library. @@ -82,7 +86,7 @@ set(CORECLR_LIBRARIES mdhotdata_full bcltype ceefgen - clrjit_static + ${CLRJIT_STATIC} comfloat_wks corguids gcinfo # Condition="'$(TargetCpu)'=='amd64' or '$(TargetCpu)' == 'arm' or '$(TargetCpu)' == 'arm64'" |