summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Obermayr <johannesobermayr@gmx.de>2012-11-30 23:53:58 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-01-20 15:08:29 +0100
commitdfb3dc3fb817af398c51269691948a93f6164a30 (patch)
tree1823f9e4d3bd7dadd410f278567d19b193f1ffa6
parent320b5abda5026f23f327c6f60c1b6287cc507e78 (diff)
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@amd.com> (cherry picked from commit 21694b8eacbf63f8abdee6340510c0458a25a7fb) Conflicts: src/gallium/auxiliary/Makefile
-rw-r--r--src/gallium/auxiliary/Makefile5
1 files changed, 5 insertions, 0 deletions
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