|
 |
7d1f13d |
diff --git a/configs/autoconf.in b/configs/autoconf.in
|
|
|
7d1f13d |
index 4e931a3..fec8e42 100644
|
|
|
7d1f13d |
--- a/configs/autoconf.in
|
|
|
7d1f13d |
+++ b/configs/autoconf.in
|
|
|
7d1f13d |
@@ -31,8 +31,8 @@ INTEL_CFLAGS = @INTEL_CFLAGS@
|
|
 |
55ddc65 |
X11_LIBS = @X11_LIBS@
|
|
|
55ddc65 |
X11_CFLAGS = @X11_CFLAGS@
|
|
|
55ddc65 |
LLVM_CFLAGS = @LLVM_CFLAGS@
|
|
|
55ddc65 |
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
|
|
|
55ddc65 |
-LLVM_LIBS = @LLVM_LIBS@
|
|
|
55ddc65 |
+LLVM_LDFLAGS = -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lllvmcore-$(shell llvm-config --version)
|
|
|
55ddc65 |
+LLVM_LIBS = -lllvmcore-$(shell llvm-config --version)
|
|
|
55ddc65 |
GLW_CFLAGS = @GLW_CFLAGS@
|
|
|
55ddc65 |
GLUT_CFLAGS = @GLUT_CFLAGS@
|
|
|
7d1f13d |
GLX_TLS = @GLX_TLS@
|
|
|
7d1f13d |
diff --git a/configs/linux-llvm b/configs/linux-llvm
|
|
|
7d1f13d |
index 359bee2..0de094d 100644
|
|
|
7d1f13d |
--- a/configs/linux-llvm
|
|
|
7d1f13d |
+++ b/configs/linux-llvm
|
|
|
55ddc65 |
@@ -32,8 +32,8 @@ endif
|
|
|
55ddc65 |
ifeq ($(MESA_LLVM),1)
|
|
|
55ddc65 |
LLVM_CFLAGS=`llvm-config --cppflags`
|
|
|
7d1f13d |
LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
|
|
|
7d1f13d |
- LLVM_LDFLAGS = $(shell llvm-config --ldflags)
|
|
|
7d1f13d |
- LLVM_LIBS = $(shell llvm-config --libs)
|
|
|
55ddc65 |
+ LLVM_LDFLAGS = -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lllvmcore-$(shell llvm-config --version)
|
|
|
55ddc65 |
+ LLVM_LIBS = -lllvmcore-$(shell llvm-config --version)
|
|
|
55ddc65 |
MKLIB_OPTIONS=-cplusplus
|
|
|
55ddc65 |
else
|
|
|
55ddc65 |
LLVM_CFLAGS=
|
|
|
7d1f13d |
diff --git a/configure.ac b/configure.ac
|
|
|
7d1f13d |
index b510151..e872f2e 100644
|
|
|
7d1f13d |
--- a/configure.ac
|
|
|
7d1f13d |
+++ b/configure.ac
|
|
|
7d1f13d |
@@ -1404,8 +1404,6 @@ if test "x$enable_gallium" = xyes; then
|
|
|
55ddc65 |
fi
|
|
|
55ddc65 |
|
|
|
55ddc65 |
AC_SUBST([LLVM_CFLAGS])
|
|
|
55ddc65 |
-AC_SUBST([LLVM_LIBS])
|
|
|
55ddc65 |
-AC_SUBST([LLVM_LDFLAGS])
|
|
|
55ddc65 |
AC_SUBST([LLVM_VERSION])
|
|
|
55ddc65 |
|
|
|
55ddc65 |
dnl
|
|
|
7d1f13d |
@@ -1649,7 +1647,6 @@ if test "x$enable_gallium_llvm" = xyes; then
|
|
|
55ddc65 |
if test "x$LLVM_CONFIG" != xno; then
|
|
|
55ddc65 |
LLVM_VERSION=`$LLVM_CONFIG --version`
|
|
|
55ddc65 |
LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
|
|
|
7d1f13d |
- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
|
|
|
55ddc65 |
|
|
|
7d1f13d |
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
|
|
7d1f13d |
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
|