From: Nick Lewycky <nicholas@mxc.ca>
Date: Sat, 24 Apr 2010 04:56:34 +0000 (+0000)
Subject: Don't touch CXXFLAGS. If it's set in the environment then sub-makes will see
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=395af84652fdcfe3b44d0ffd1422301361980253;p=oota-llvm.git

Don't touch CXXFLAGS. If it's set in the environment then sub-makes will see
the variable that we set as though it came from the user. Fixes PR6835.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@102239 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/Makefile.rules b/Makefile.rules
index 0c8469a3133..ba4fd3a30eb 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -388,7 +388,6 @@ endif
 # 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