[llvm-branch-commits] [llvm-branch] r102310 - /llvm/branches/release_27/Makefile.rules

[Tanya Lattner]

Author: tbrethou
Date: Sun Apr 25 14:18:33 2010
New Revision: 102310

URL: http://llvm.org/viewvc/llvm-project?rev=102310&view=rev
Log:
Merge 102239 from mainline to fix PR6835
-gThis line, and those below, will be ignored--

M    Makefile.rules

Modified:
    llvm/branches/release_27/Makefile.rules

Modified: llvm/branches/release_27/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/Makefile.rules?rev=102310&r1=102309&r2=102310&view=diff
==============================================================================
--- llvm/branches/release_27/Makefile.rules (original)
+++ llvm/branches/release_27/Makefile.rules Sun Apr 25 14:18:33 2010
@@ -388,7 +388,6 @@
 # If REQUIRES_RTTI=1 is specified then don't disable run-time type id.
 ifneq ($(REQUIRES_RTTI), 1)
   CXX.Flags += -fno-rtti
-  CXXFLAGS += -fno-rtti
 endif
 
 ifdef ENABLE_COVERAGE