Revert "build: llvm libs may not be in system search path, add rpath"
authorIlia Mirkin <imirkin@alum.mit.edu>
Mon, 17 Mar 2014 13:41:15 +0000 (09:41 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Tue, 25 Mar 2014 21:18:46 +0000 (17:18 -0400)
This reverts commit d9b983519c63b9072677364a6e399d213a1855e5.

Unfortunately it seems like rpath is evaluated before LD_LIBRARY_PATH,
so this breaks e.g. steam, as well as any other user of that env var,
if the llvm path happens to be where other libs also reside.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76082
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
configure.ac

index c5042f93ee71b4bc45a9dfe8936220edef5aed6a..97d7dc5eaf18a24e5c5c18e993b3b7ee2a17c925 100644 (file)
@@ -1549,7 +1549,6 @@ 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"])