X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-llvm;h=dbf7e3ed7a9e85291d424633deed173ac463eacd;hb=562c127693200822f04a145db50add1be2425d7b;hp=a9d740574cfed12ce642e020e47e3b0385863dd3;hpb=658b1bdb1cc5f9910be910dc156a2e81ed999756;p=mesa.git

diff --git a/configs/linux-llvm b/configs/linux-llvm
index a9d740574cf..dbf7e3ed7a9 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -1,14 +1,19 @@
 # -*-makefile-*-
 # Configuration for Linux and LLVM with debugging info
+# Builds the llvmpipe gallium driver
 
 include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
-GALLIUM_AUXILIARY_DIRS += gallivm
+# Add llvmpipe driver
+GALLIUM_DRIVERS_DIRS += llvmpipe
 
 OPT_FLAGS = -g -ansi -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
+DEFINES += -DDEBUG -DDEBUG_MATH -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
+
+# override -std=c99
+CFLAGS += -std=gnu99
 
 LLVM_VERSION := $(shell llvm-config --version)
 
@@ -17,14 +22,14 @@ ifeq ($(LLVM_VERSION),)
   MESA_LLVM=0
 else
   MESA_LLVM=1
-  $(info Using LLVM version: $(LLVM_VERSION))
+#  $(info Using LLVM version: $(LLVM_VERSION))
 endif
 
 ifeq ($(MESA_LLVM),1)
 #  LLVM_CFLAGS=`llvm-config --cflags`
-  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo` -Wno-long-long
-  LLVM_LDFLAGS=`llvm-config --ldflags backend bitreader engine ipo`
-  LLVM_LIBS=`llvm-config --libs backend bitreader engine ipo`
+  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
+  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
+  LLVM_LIBS = $(shell llvm-config --libs backend bitreader engine ipo interpreter instrumentation)
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
@@ -32,4 +37,4 @@ else
 endif
 
 LD = g++
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86