diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2021-04-10 04:15:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-10 04:15:26 +0300 |
| commit | 2a5bd56913a2fc85418c0156121a22ec1201dab1 (patch) | |
| tree | ffff0cb8fb883466d9f31ca1896390b99e7b9306 /src/coreclr/crosscomponents.cmake | |
| parent | 2215a47fd786063662667aa18a79421596e90cf4 (diff) | |
Install crossgen, jitinterface, clrjit into the sharedframework folder in crosscomponent build. (#51004)
* Install crossgen, jitinterface, clrjit into the sharedframework folder.
* Remove unneeded dependency
* Add dac/dbi to cross-component sharedFramework folder.
* Don't install the cross-os dac in crosscomponents in cross-bitness scenarios.
* Jit Interface doesn't need to go into the sharedFramework folder (it wasn't there in 6.0.0p3)
Diffstat (limited to 'src/coreclr/crosscomponents.cmake')
| -rw-r--r-- | src/coreclr/crosscomponents.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake index e8d51914951..03b076becfb 100644 --- a/src/coreclr/crosscomponents.cmake +++ b/src/coreclr/crosscomponents.cmake @@ -3,6 +3,11 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) install_clr (TARGETS clrjit + DESTINATIONS . sharedFramework + COMPONENT crosscomponents + ) + install_clr (TARGETS + clrjit jitinterface_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT crosscomponents @@ -11,7 +16,7 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) if(CLR_CMAKE_HOST_LINUX OR NOT FEATURE_CROSSBITNESS) install_clr (TARGETS crossgen - DESTINATIONS . + DESTINATIONS . sharedFramework COMPONENT crosscomponents ) endif() @@ -19,7 +24,7 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) if (CLR_CMAKE_TARGET_UNIX) install_clr (TARGETS clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} - DESTINATIONS . + DESTINATIONS . sharedFramework COMPONENT crosscomponents ) endif(CLR_CMAKE_TARGET_UNIX) @@ -29,7 +34,7 @@ if(NOT CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_OSX AND NOT FEATURE_CROSSBITN install_clr (TARGETS mscordaccore mscordbi - DESTINATIONS . + DESTINATIONS . sharedFramework COMPONENT crosscomponents ) endif() |