Mesa (master): gallium/auxiliary: Add -fno-rtti to CXXFLAGS on LLVM >= 3.2.
Tom Stellard
tstellar at kemper.freedesktop.org
Tue Dec 4 00:28:07 UTC 2012
Module: Mesa
Branch: master
Commit: 21694b8eacbf63f8abdee6340510c0458a25a7fb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=21694b8eacbf63f8abdee6340510c0458a25a7fb
Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date: Fri Nov 30 23:53:58 2012 +0100
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 <thomas.stellard at amd.com>
---
src/gallium/auxiliary/Makefile | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
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
More information about the mesa-commit
mailing list