From 21694b8eacbf63f8abdee6340510c0458a25a7fb Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Fri, 30 Nov 2012 23:53:58 +0100 Subject: [PATCH] gallium/auxiliary: Add -fno-rtti to CXXFLAGS on LLVM >= 3.2. Also remove the recently added and overloaded LLVM_CXXFLAGS from CXXFLAGS. Note: This is a candidate for the stable branches. Reviewed-by: Tom Stellard --- src/gallium/auxiliary/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index dc2800337a5..72208f1a7f2 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -13,7 +13,11 @@ C_SOURCES += \ $(GALLIVM_SOURCES) CPP_SOURCES += \ $(GALLIVM_CPP_SOURCES) -CXXFLAGS += $(LLVM_CXXFLAGS) + +# LLVM >= 3.2 requires -fno-rtti +ifeq ($(shell expr `echo $(LLVM_VERSION) | sed -e 's/\([0-9]\)\.\([0-9]\)/\10\2/g'` \>= 302),1) +CXXFLAGS += -fno-rtti +endif endif -- 2.30.2