X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-llvm;h=44e200e8565cee208220a5df1a6c97fc5e48a9b3;hb=984a7c4e9c42cf8ddfcff5b880b522a6dd58bce2;hp=8e9b40886150e3106a7122e309f402514333a8dd;hpb=d76a7b61bb2de2425289f462e07a678cf3c4ba59;p=mesa.git

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 8e9b4088615..44e200e8565 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -1,11 +1,14 @@
-# Configuration for debugging on Linux
+# -*-makefile-*-
+# Configuration for Linux and LLVM with debugging info
 
 include $(TOP)/configs/linux
 
-CONFIG_NAME = linux-debug
+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,11 +21,11 @@ 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_CFLAGS=`llvm-config --cflags`
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
   LLVM_LDFLAGS=`llvm-config --ldflags`
   LLVM_LIBS=`llvm-config --libs`
+  MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
   LLVM_CXXFLAGS=