Sfoglia il codice sorgente

use multiple rpath options for sgi

Bill Hoffman 23 anni fa
parent
commit
0f9ee5bd0a
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 2 2
      Templates/cconfigure
  2. 2 2
      Templates/cconfigure.in

+ 2 - 2
Templates/cconfigure

@@ -2492,7 +2492,7 @@ fi
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
-        CMAKE_SHLIB_RUNTIME_SEP=":"
+        CMAKE_SHLIB_RUNTIME_SEP=""
 	;;
 	;;
     IRIX-6* | IRIX64-6* | IRIX-64-6*)
     IRIX-6* | IRIX64-6* | IRIX-64-6*)
 	CMAKE_SHLIB_CFLAGS=""
 	CMAKE_SHLIB_CFLAGS=""
@@ -2503,7 +2503,7 @@ fi
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
-        CMAKE_SHLIB_RUNTIME_SEP=":"
+        CMAKE_SHLIB_RUNTIME_SEP=""
 	;;
 	;;
     Linux*)
     Linux*)
 	CMAKE_SHLIB_CFLAGS="-fPIC"
 	CMAKE_SHLIB_CFLAGS="-fPIC"

+ 2 - 2
Templates/cconfigure.in

@@ -214,7 +214,7 @@ case $system in
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
-        CMAKE_SHLIB_RUNTIME_SEP=":"
+        CMAKE_SHLIB_RUNTIME_SEP=""
 	;;
 	;;
     IRIX-6* | IRIX64-6* | IRIX-64-6*)
     IRIX-6* | IRIX64-6* | IRIX-64-6*)
 	CMAKE_SHLIB_CFLAGS=""
 	CMAKE_SHLIB_CFLAGS=""
@@ -225,7 +225,7 @@ case $system in
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_SHLIB_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
 	CMAKE_MODULE_BUILD_FLAGS="-shared -rdata_shared"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
         CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
-        CMAKE_SHLIB_RUNTIME_SEP=":"
+        CMAKE_SHLIB_RUNTIME_SEP=""
 	;;
 	;;
     Linux*)
     Linux*)
 	CMAKE_SHLIB_CFLAGS="-fPIC"
 	CMAKE_SHLIB_CFLAGS="-fPIC"