From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon, 24 Feb 2014 17:43:17 +0000 (-0500)
Subject: build: llvm libs may not be in system search path, add rpath
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9b983519c63b9072677364a6e399d213a1855e5;p=mesa.git

build: llvm libs may not be in system search path, add rpath

On my gentoo system, llvm libs are in /usr/lib64/llvm, and llvm-config
--ldflags does not provide the rpath (it does, of course, provide a -L).
This adds the llvm dir to the rpath. It should be harmless if the path
is a system path, and should make things work when it's not.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index b8e3161e116..0e0fd1820f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1558,6 +1558,7 @@ if test "x$enable_gallium_llvm" = xyes; then
         LLVM_CXXFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cxxflags"`
         LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
         LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
+        LLVM_LDFLAGS="-Wl,-rpath,$LLVM_LIBDIR $LLVM_LDFLAGS"
 
         AC_COMPUTE_INT([LLVM_VERSION_MAJOR], [LLVM_VERSION_MAJOR],
             [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"])