From dfb3dc3fb817af398c51269691948a93f6164a30 Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Fri, 30 Nov 2012 23:53:58 +0100 Subject: 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 (cherry picked from commit 21694b8eacbf63f8abdee6340510c0458a25a7fb) Conflicts: src/gallium/auxiliary/Makefile --- src/gallium/auxiliary/Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index 3ba3f9c40b4..72208f1a7f2 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -13,6 +13,11 @@ C_SOURCES += \ $(GALLIVM_SOURCES) CPP_SOURCES += \ $(GALLIVM_CPP_SOURCES) + +# 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 -- cgit v1.2.3