[Mesa-dev] [PATCH] gallium/auxiliary: Add -fno-rtti to CXXFLAGS on LLVM >= 3.2.

Johannes Obermayr johannesobermayr at gmx.de
Fri Nov 30 14:53:58 PST 2012


Also remove the recently added and overloaded LLVM_CXXFLAGS from CXXFLAGS.

Note: This is a candidate for the stable branches.
---
 src/gallium/auxiliary/Makefile |    6 +++++-
 1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index dc28003..72208f1 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
 
 
-- 
1.7.10.4



More information about the mesa-dev mailing list