diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-11 21:21:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 21:21:31 +0200 |
| commit | 3fc705b00f1a96d81af9ae2724902f551b1d49f0 (patch) | |
| tree | d9a948cd77f0d90c9d6bbf180e160d1f3da207ba | |
| parent | 3aa9daa64e34d070ecdb866721042a2027e2c5d7 (diff) | |
| parent | 033d5c7235bdf7b6f66427852598672a99f6dd92 (diff) | |
Merge pull request #3087 from vespa-engine/toregge/dont-pass-empty-cmake-build-rpath-to-linker
Don't pass empty CMAKE_BUILD_RPATH to linker.
| -rw-r--r-- | build_settings.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index f3d47e876b2..cb613688941 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -87,8 +87,10 @@ endif() if(EXTRA_LINK_DIRECTORY) link_directories(${EXTRA_LINK_DIRECTORY}) endif() +if(CMAKE_BUILD_RPATH) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath,${CMAKE_BUILD_RPATH}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,${CMAKE_BUILD_RPATH}") +endif() # Don't allow unresolved symbols in executables or shared libraries set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") |