Mesa (master): mesa/llvm: use llvm-config --cppflags

[Brian Paul]

Module: Mesa
Branch: master
Commit: c1095f0b0c636832acdfeb5dbf5595cb9b8bf513
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1095f0b0c636832acdfeb5dbf5595cb9b8bf513

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Dec  6 10:10:58 2010 -0700

mesa/llvm: use llvm-config --cppflags

Use --cppflags instead of --cflags so that we get the -I and -D flags
we want, but not compiler options like -O3.

A similar change should probably be made for autoconf.

---

 configs/linux-llvm |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 9b06be9..22de066 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -12,8 +12,7 @@ GALLIUM_DRIVERS_DIRS += llvmpipe
 OPT_FLAGS = -O3 -ansi -pedantic
 ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
 
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 \
-	-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
+DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
 
 # override -std=c99
 CFLAGS += -std=gnu99
@@ -31,7 +30,7 @@ else
 endif
 
 ifeq ($(MESA_LLVM),1)
-#  LLVM_CFLAGS=`llvm-config --cflags`
+  LLVM_CFLAGS=`llvm-config --cppflags`
   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 bitwriter bitreader engine ipo interpreter instrumentation)