From 36b7043611952fc116940e903e5412e9ed8d61ee Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Thu, 23 Oct 2014 17:17:07 -0400 Subject: configure: include llvm systemlibs when using static llvm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jan Vesely (cherry picked from commit af9551e68c8c964a3a80d74b6ed543b800318b33) --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3