summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-01-24 20:20:40 +0000
committerChris Lattner <sabre@nondot.org>2010-01-24 20:20:40 +0000
commitc96d508184cc1a3f2cd16cd7219a2deef75e14c4 (patch)
treec4a055bfb0b9addfc34402fd458d42eaf9b2326a /Makefile.rules
parent43dc2e6d76ba6b9c61151132d6313b571cd87c82 (diff)
downloadllvm-c96d508184cc1a3f2cd16cd7219a2deef75e14c4.tar.gz
llvm-c96d508184cc1a3f2cd16cd7219a2deef75e14c4.tar.bz2
llvm-c96d508184cc1a3f2cd16cd7219a2deef75e14c4.tar.xz
ENABLE_EXPENSIVE_CHECKS shouldn't know how rtti is enabled, let REQUIRES_RTTI handle it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94375 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules13
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 3d436c4508..6e95998a46 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -365,6 +365,12 @@ endif
# CXX.Flags += -fvisibility-inlines-hidden
#endif
+ifdef ENABLE_EXPENSIVE_CHECKS
+ # GNU libstdc++ uses RTTI if you define _GLIBCXX_DEBUG, which we did above.
+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40160
+ REQUIRES_RTTI := 1
+endif
+
# IF REQUIRES_EH=1 is specified then don't disable exceptions
ifndef REQUIRES_EH
CXX.Flags += -fno-exceptions
@@ -468,13 +474,6 @@ ifeq ($(ARCH),Alpha)
LD.Flags += -Wl,--no-relax
endif
-ifdef ENABLE_EXPENSIVE_CHECKS
- # GNU libstdc++ uses RTTI if you define _GLIBCXX_DEBUG, which we did above.
- # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40160
- CXX.Flags := $(filter-out -fno-rtti,$(CXX.Flags))
- CXXFLAGS := $(filter-out -fno-rtti,$(CXXFLAGS))
-endif
-
#--------------------------------------------------------------------
# Directory locations
#--------------------------------------------------------------------