From b87369e863c4c9650ef3a04a111e9ca79bca9e08 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 3 Dec 2010 10:59:52 -0700 Subject: mesa: consolidate some compiler -D flags -D__STDC_CONSTANT_MACROS and -D__STDC_LIMIT_MACROS are only needed for LLVM build. --- configs/linux-llvm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/linux-llvm b/configs/linux-llvm index 6aa434032dc..9b06be933d4 100644 --- a/configs/linux-llvm +++ b/configs/linux-llvm @@ -12,10 +12,11 @@ GALLIUM_DRIVERS_DIRS += llvmpipe OPT_FLAGS = -O3 -ansi -pedantic ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign -DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 +DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86 \ + -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS # override -std=c99 -CFLAGS += -std=gnu99 -D__STDC_CONSTANT_MACROS +CFLAGS += -std=gnu99 LLVM_VERSION := $(shell llvm-config --version) -- cgit v1.2.3 From c1095f0b0c636832acdfeb5dbf5595cb9b8bf513 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 6 Dec 2010 10:10:58 -0700 Subject: 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 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/linux-llvm b/configs/linux-llvm index 9b06be933d4..22de0662ee1 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) -- cgit v1.2.3