diff options
| author | John Brawn <john.brawn@arm.com> | 2016-11-03 13:55:04 +0000 |
|---|---|---|
| committer | John Brawn <john.brawn@arm.com> | 2016-11-03 13:55:04 +0000 |
| commit | ec1bce853c8fd974bd1efc258dafc11b9500ab24 (patch) | |
| tree | c2d28f5ca71ac6381ecffa93cf2c5eed8e6dffec | |
| parent | 89f12c0c50dc6254b9df5a09e7cc116eddc4af86 (diff) | |
| download | bcm5719-llvm-ec1bce853c8fd974bd1efc258dafc11b9500ab24.tar.gz bcm5719-llvm-ec1bce853c8fd974bd1efc258dafc11b9500ab24.zip | |
[CMake] Make CMAKE_INSTALL_RPATH work again
r285714 made it so that when CMAKE_INSTALL_RPATH is set _install_rpath is not
set, but that means INSTALL_RPATH gets set to an empty string which isn't what
we want. Fix this by setting INSTALL_RPATH only when _install_rpath is set.
llvm-svn: 285908
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 32ef66ab7c4..238b8810f42 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -1351,8 +1351,10 @@ function(llvm_setup_rpath name) return() endif() - set_target_properties(${name} PROPERTIES - BUILD_WITH_INSTALL_RPATH On - INSTALL_RPATH "${_install_rpath}" - ${_install_name_dir}) + if(DEFINED _install_rpath) + set_target_properties(${name} PROPERTIES + BUILD_WITH_INSTALL_RPATH On + INSTALL_RPATH "${_install_rpath}" + ${_install_name_dir}) + endif() endfunction() |
