diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-09-24 15:09:51 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-09-24 15:09:51 +0000 |
| commit | 5a60bc574350ce71985f686a32b7d3862beca9af (patch) | |
| tree | 8e90c4fcb09bafc09c0f43ff21df5158f8fc501c /openmp/runtime | |
| parent | d75d3b94fdeb736827e571698d8d332a05a147fb (diff) | |
| download | bcm5719-llvm-5a60bc574350ce71985f686a32b7d3862beca9af.tar.gz bcm5719-llvm-5a60bc574350ce71985f686a32b7d3862beca9af.zip | |
[OpenMP Testsuite] Mac rpath specified when compiling tests
llvm-svn: 248500
Diffstat (limited to 'openmp/runtime')
| -rw-r--r-- | openmp/runtime/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | openmp/runtime/test/lit.cfg | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index d0c1183ac82..9ed68e05d4e 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -138,7 +138,6 @@ set_target_properties(omp PROPERTIES PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} - SKIP_BUILD_RPATH true # have Mac linker -install_name just be "-install_name libomp.dylib" ) # Get the library's location within the build tree for the unit tester @@ -209,7 +208,6 @@ if(WIN32) set_target_properties(ompimp PROPERTIES PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" LINKER_LANGUAGE C - SKIP_BUILD_RPATH true ) add_dependencies(ompimp omp) # ensure generated import library is created first diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg index b86c86f9063..5529c4745d9 100644 --- a/openmp/runtime/test/lit.cfg +++ b/openmp/runtime/test/lit.cfg @@ -42,6 +42,7 @@ if config.operating_system == 'Windows': append_dynamic_library_path('PATH', config.library_dir, ";") elif config.operating_system == 'Darwin': append_dynamic_library_path('DYLD_LIBRARY_PATH', config.library_dir, ":") + config.test_cflags += " -Wl,-rpath," + config.library_dir else: # Unices append_dynamic_library_path('LD_LIBRARY_PATH', config.library_dir, ":") |
