[Openmp-commits] [openmp] r248500 - [OpenMP Testsuite] Mac rpath specified when compiling tests

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Thu Sep 24 10:09:51 2015
New Revision: 248500

URL: http://llvm.org/viewvc/llvm-project?rev=248500&view=rev
Log:
[OpenMP Testsuite] Mac rpath specified when compiling tests

Modified:
    openmp/trunk/runtime/src/CMakeLists.txt
    openmp/trunk/runtime/test/lit.cfg

Modified: openmp/trunk/runtime/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/CMakeLists.txt?rev=248500&r1=248499&r2=248500&view=diff
==============================================================================
--- openmp/trunk/runtime/src/CMakeLists.txt (original)
+++ openmp/trunk/runtime/src/CMakeLists.txt Thu Sep 24 10:09:51 2015
@@ -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
 

Modified: openmp/trunk/runtime/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/lit.cfg?rev=248500&r1=248499&r2=248500&view=diff
==============================================================================
--- openmp/trunk/runtime/test/lit.cfg (original)
+++ openmp/trunk/runtime/test/lit.cfg Thu Sep 24 10:09:51 2015
@@ -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, ":")