[LLVMdev] [PATCH] Use GCC_INSTALL_PREFIX for rpath if set.

Russell Harmon eatnumber1 at google.com
Thu May 29 15:37:35 PDT 2014


This way, an LLVM compiled after setting GCC_INSTALL_PREFIX will work correctly
if you don't want to install LLVM into the GCC_INSTALL_PREFIX.
---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ec3e33..c85a028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -450,7 +450,12 @@ if (APPLE)
   set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
 else(UNIX)
   if(NOT DEFINED CMAKE_INSTALL_RPATH)
-    set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+    if(DEFINED GCC_INSTALL_PREFIX)
+      set(CMAKE_INSTALL_RPATH "${GCC_INSTALL_PREFIX}/lib")
+    else()
+      set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+    endif()
+
     if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin")
     endif()
-- 
1.9.1.423.g4596e3a




More information about the llvm-dev mailing list