diff options
| author | Steve MacLean <Steve.MacLean@microsoft.com> | 2020-12-13 01:23:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 01:23:29 +0300 |
| commit | 60b6af1beaf6f973d80cf28d78f3284e2df342c7 (patch) | |
| tree | 3349333434ddbd3b603c1375b3ee68b0761ca101 /src/coreclr/dlls | |
| parent | 134453cc72b88637394c87a8c99cbc9c55cb3017 (diff) | |
Fix macos DAC & DBI search dependency paths (#45978)
* Fix macos DAC & DBI search dependency paths
* Only apply changes to macos-arm64
Diffstat (limited to 'src/coreclr/dlls')
| -rw-r--r-- | src/coreclr/dlls/mscordac/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/coreclr/dlls/mscordbi/CMakeLists.txt | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/coreclr/dlls/mscordac/CMakeLists.txt b/src/coreclr/dlls/mscordac/CMakeLists.txt index a66f99e4251..f9c93fdec12 100644 --- a/src/coreclr/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/dlls/mscordac/CMakeLists.txt @@ -35,6 +35,11 @@ else(CLR_CMAKE_HOST_WIN32) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) endif(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) + if(CORECLR_SET_RPATH AND CLR_CMAKE_HOST_OSX AND CLR_CMAKE_HOST_ARCH_ARM64) + set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) + set(CMAKE_INSTALL_NAME_DIR "@rpath") + endif(CORECLR_SET_RPATH AND CLR_CMAKE_HOST_OSX AND CLR_CMAKE_HOST_ARCH_ARM64) + if(CLR_CMAKE_HOST_LINUX) # Generate DAC export file with the DAC_ prefix diff --git a/src/coreclr/dlls/mscordbi/CMakeLists.txt b/src/coreclr/dlls/mscordbi/CMakeLists.txt index 85f6cb6a749..a0fae494846 100644 --- a/src/coreclr/dlls/mscordbi/CMakeLists.txt +++ b/src/coreclr/dlls/mscordbi/CMakeLists.txt @@ -2,10 +2,16 @@ # Set the RPATH of mscordbi so that it can find dependencies without needing to set LD_LIBRARY_PATH # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling. if(CORECLR_SET_RPATH) - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) if(CLR_CMAKE_HOST_OSX) - set(CMAKE_INSTALL_RPATH "@loader_path") + if(CLR_CMAKE_HOST_ARCH_ARM64) + set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) + set(CMAKE_INSTALL_NAME_DIR "@rpath") + else(CLR_CMAKE_HOST_ARCH_ARM64) + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + set(CMAKE_INSTALL_RPATH "@loader_path") + endif(CLR_CMAKE_HOST_ARCH_ARM64) else() + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH "\$ORIGIN") endif(CLR_CMAKE_HOST_OSX) endif(CORECLR_SET_RPATH) |