diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-01-24 20:20:40 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-01-24 20:20:40 +0000 |
| commit | ab8a7c49b281de14bbbe5eefe6c852e7be925c24 (patch) | |
| tree | 832b21a815b9513974e6715e0f20e85028c618c7 | |
| parent | e3a68d10639c10fbe8dfce6dae3ea74023dcf8b9 (diff) | |
| download | bcm5719-llvm-ab8a7c49b281de14bbbe5eefe6c852e7be925c24.tar.gz bcm5719-llvm-ab8a7c49b281de14bbbe5eefe6c852e7be925c24.zip | |
ENABLE_EXPENSIVE_CHECKS shouldn't know how rtti is enabled, let REQUIRES_RTTI handle it.
llvm-svn: 94375
| -rw-r--r-- | llvm/Makefile.rules | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 3d436c45089..6e95998a461 100644 --- a/llvm/Makefile.rules +++ b/llvm/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 #-------------------------------------------------------------------- |
