[llvm-commits] [llvm] r94375 - /llvm/trunk/Makefile.rules
Chris Lattner
sabre at nondot.org
Sun Jan 24 12:20:40 PST 2010
Author: lattner
Date: Sun Jan 24 14:20:40 2010
New Revision: 94375
URL: http://llvm.org/viewvc/llvm-project?rev=94375&view=rev
Log:
ENABLE_EXPENSIVE_CHECKS shouldn't know how rtti is enabled, let REQUIRES_RTTI handle it.
Modified:
llvm/trunk/Makefile.rules
Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=94375&r1=94374&r2=94375&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sun Jan 24 14:20:40 2010
@@ -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
#--------------------------------------------------------------------
More information about the llvm-commits
mailing list