From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon, 17 Mar 2014 13:41:15 +0000 (-0400)
Subject: Revert "build: llvm libs may not be in system search path, add rpath"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=29bcc73d4db639681f679b43075798c78f268ebf;p=mesa.git

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

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>
---

diff --git a/configure.ac b/configure.ac
index c5042f93ee7..97d7dc5eaf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"])