Skip to content

Commit f692901

Browse files
committed
Always set RPATH in test paltest_pal_sxs_test1
1 parent a727b14 commit f692901

File tree

1 file changed

+3
-5
lines changed
  • src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1

1 file changed

+3
-5
lines changed

src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ endif(CLR_CMAKE_HOST_UNIX)
55
# Set the RPATH of paltest_pal_sxs_test1 so that it can find dependencies without needing to set LD_LIBRARY
66
# For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling.
77
if(CORECLR_SET_RPATH)
8+
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
89
if(CLR_CMAKE_HOST_OSX)
910
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
1011
set(CMAKE_INSTALL_NAME_DIR "@rpath")
11-
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
1212
set(CMAKE_INSTALL_RPATH "@loader_path")
13-
endif(CLR_CMAKE_HOST_OSX)
14-
if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_HAIKU)
15-
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
13+
else()
1614
set(CMAKE_INSTALL_RPATH "\$ORIGIN")
17-
endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_HAIKU)
15+
endif(CLR_CMAKE_HOST_OSX)
1816
endif(CORECLR_SET_RPATH)
1917

2018
# Test DLL1

0 commit comments

Comments
 (0)