diff options
| author | Johannes Obermayr <[email protected]> | 2012-11-30 23:53:58 +0100 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2012-12-03 19:07:43 -0500 |
| commit | 21694b8eacbf63f8abdee6340510c0458a25a7fb (patch) | |
| tree | 61fec37875cf3b8471ca6e6fa342f9f09a9346eb | |
| parent | e866bd1adea2c3b4971ad68e69c644752f2ab7b6 (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 <[email protected]>
| -rw-r--r-- | 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 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 |