X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=configs%2Flinux-llvm;h=e7ecd826d5310db1a8d10c5143e5ac5e38f4e015;hb=a910c7d8202d42d2637aeeac3f3e9f2cd77ffc07;hp=6d1f31daa2723da1963c8f9b47311f444c246dee;hpb=63a9d835ce3f446fe2cf69e7623d228bcc6ee91c;p=mesa.git

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 6d1f31daa27..e7ecd826d53 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -1,11 +1,14 @@
+# -*-makefile-*-
 # Configuration for Linux and LLVM with debugging info
 
 include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
+GALLIUM_AUXILIARY_DIRS += gallivm
+
 OPT_FLAGS = -g -ansi -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH
+DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
 
 LLVM_VERSION := $(shell llvm-config --version)
 
@@ -18,15 +21,15 @@ else
 endif
 
 ifeq ($(MESA_LLVM),1)
-#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_LLVM=1
-  LLVM_CFLAGS=-DMESA_LLVM=1
-  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_LLVM=1 -Wno-long-long
-  LLVM_LDFLAGS=`llvm-config --ldflags`
-  LLVM_LIBS=`llvm-config --libs`
+#  LLVM_CFLAGS=`llvm-config --cflags`
+  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
+  LLVM_LDFLAGS=`llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation`
+  LLVM_LIBS=`llvm-config --libs backend bitreader engine ipo interpreter instrumentation`
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
   LLVM_CXXFLAGS=
 endif
 
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+LD = g++
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++