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
diff --git a/Makefile.rules b/Makefile.rules
index 3d436c4..6e95998 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -365,6 +365,12 @@
# 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 @@
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
#--------------------------------------------------------------------