summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Vesely <jan.vesely@rutgers.edu>2014-10-23 17:17:07 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2014-10-29 18:54:55 +0000
commit36b7043611952fc116940e903e5412e9ed8d61ee (patch)
treea929e7b956ef793e2ae9a9da314cbb15b0f79028
parent894ac63c34413d1ee0c7269c58a9d10451a28646 (diff)
configure: include llvm systemlibs when using static llvm
v2: drop -WL,--exclude-libs, it's not necessary fix tabs/spaces Cc: mesa-stable@lists.freedesktop.org Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70410 Tested-by: Kai Wasserb├Ąch <kai@dev.carbon-project.org> Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> (cherry picked from commit af9551e68c8c964a3a80d74b6ed543b800318b33)
-rw-r--r--configure.ac7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 41b35a92a73..e97dccda1da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2057,7 +2057,12 @@ if test "x$MESA_LLVM" != x0; then
dnl already added all of these objects to LLVM_LIBS.
fi
else
- AC_MSG_WARN([Building mesa with staticly linked LLVM may cause compilation issues])
+ AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues])
+ dnl We need to link to llvm system libs when using static libs
+ dnl However, only llvm 3.5+ provides --system-libs
+ if test $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then
+ LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`"
+ fi
fi
fi