diff options
| author | David Wrighton <davidwr@microsoft.com> | 2021-04-16 23:35:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 23:35:57 +0300 |
| commit | be307a8bf8ab3f3e43b745aa12a840ed4e7898de (patch) | |
| tree | e23776417b13bd74360ab6496bc16fc3910fa537 /src/coreclr/crosscomponents.cmake | |
| parent | 5bbb9b671d9b1735042f5a17531d846cc3f5e105 (diff) | |
Fix crossgen2 build (#51349)
- Include osx arm64 jit in package
- Also use that jit when appropriate
- build for all rids
- build cross targeting test scenario variant from separate project file to avoid issue with incorrect app host rid
- Remove app host from cross targeting x64 crossgen used in test scenarios
Diffstat (limited to 'src/coreclr/crosscomponents.cmake')
| -rw-r--r-- | src/coreclr/crosscomponents.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake index 03b076becfb..aa991eaef3a 100644 --- a/src/coreclr/crosscomponents.cmake +++ b/src/coreclr/crosscomponents.cmake @@ -21,7 +21,13 @@ if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS) ) endif() - if (CLR_CMAKE_TARGET_UNIX) + if(CLR_CMAKE_TARGET_OSX AND ARCH_TARGET_NAME STREQUAL arm64) + install_clr (TARGETS + clrjit_unix_osx_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} + DESTINATIONS . sharedFramework + COMPONENT crosscomponents + ) + elseif (CLR_CMAKE_TARGET_UNIX) install_clr (TARGETS clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} DESTINATIONS . sharedFramework |