diff options
| author | Marc Chevrier <marc.chevrier@sap.com> | 2015-12-11 10:08:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-12-11 14:21:47 (GMT) |
| commit | f254276fc1a17de7cd5cfc016fd2137937830fca (patch) | |
| tree | 16a9be779a054afe29666b659ba18a7e1dca65e7 /Modules/Platform/HP-UX-HP.cmake | |
| parent | fd7180f0c0c2554c31afda235469df986a109fe4 (diff) | |
| download | CMake-f254276fc1a17de7cd5cfc016fd2137937830fca.zip CMake-f254276fc1a17de7cd5cfc016fd2137937830fca.tar.gz CMake-f254276fc1a17de7cd5cfc016fd2137937830fca.tar.bz2 | |
AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW
The CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS setting has always been meant
for flags needed to export symbols from executables for use by shared
library plugins. Since commit v3.4.0-rc1~58^2~1 (CMP0065: Restrict the
use of CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS, 2015-08-24) this is made
explicit by using the flags only for executables with ENABLE_EXPORTS,
guarded by CMP0065 for compatibility.
On some platforms we were accidentally using this setting to pass other
flags to the linker:
* AIX: -bnoipath, -brtl
* HP-UX: +s, +nodefaultrpath
These flags are incorrectly dropped when CMP0065 is set to NEW. Fix
this by moving the flags to more appropriate places for linking
executables.
Diffstat (limited to 'Modules/Platform/HP-UX-HP.cmake')
| -rw-r--r-- | Modules/Platform/HP-UX-HP.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Platform/HP-UX-HP.cmake b/Modules/Platform/HP-UX-HP.cmake index 871ea13..3935c31 100644 --- a/Modules/Platform/HP-UX-HP.cmake +++ b/Modules/Platform/HP-UX-HP.cmake @@ -22,10 +22,12 @@ macro(__hpux_compiler_hp lang) set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "+Z") set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "+Z") set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-Wl,-E,+nodefaultrpath -b -L/usr/lib") - set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,+s,-E,+nodefaultrpath") + set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-E") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,+b") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,+h") set(CMAKE_${lang}_FLAGS_INIT "") + + set(CMAKE_${lang}_LINK_FLAGS "-Wl,+s,+nodefaultrpath") endmacro() |