https://github.com/Kitware/CMake
Revision 3ec9226779776811240bde88a3f173c29aa935b5 authored by Lior Goldberg on 25 December 2015, 13:08:51 UTC, committed by Brad King on 15 January 2016, 19:53:24 UTC
Some compilers may add their own RPATH entries when invoking the linker. For example, a GCC installation may contain the following definition in the specs file: *link_libgcc: %D -rpath <<some specific rpath in which libstdc++.so can be found>> In this case binaries may contain RPATH entries that CMake did not add. When we update the RPATH on installation we must preserve these entries even if CMake thinks the INSTALL_RPATH value should be empty. Fix this by always using file(RPATH_CHANGE) and teach it to behave as file(RPATH_REMOVE) if the actual RPATH in the file is empty after replacing the build-tree RPATH with the install-tree RPATH. This will preserve any compiler-added RPATH value instead of removing it.
1 parent b8d002a
Tip revision: 3ec9226779776811240bde88a3f173c29aa935b5 authored by Lior Goldberg on 25 December 2015, 13:08:51 UTC
install: Do not remove compiler-defined RPATH entries
install: Do not remove compiler-defined RPATH entries
Tip revision: 3ec9226
| File | Mode | Size |
|---|---|---|
| Auxiliary | ||
| Help | ||
| Licenses | ||
| Modules | ||
| Packaging | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .gitattributes | -rw-r--r-- | 613 bytes |
| .hooks-config.bash | -rw-r--r-- | 866 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 8.5 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 10.2 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 26.2 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CONTRIBUTING.rst | -rw-r--r-- | 1005 bytes |
| CTestConfig.cmake | -rw-r--r-- | 870 bytes |
| CTestCustom.cmake.in | -rw-r--r-- | 5.1 KB |
| CompileFlags.cmake | -rw-r--r-- | 3.1 KB |
| Copyright.txt | -rw-r--r-- | 2.6 KB |
| DartConfig.cmake | -rw-r--r-- | 804 bytes |
| README.rst | -rw-r--r-- | 2.9 KB |
| bootstrap | -rwxr-xr-x | 45.5 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 790 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
