Merge 102239 from mainline to fix PR6835
-gThis line, and those below, will be ignored--

M    Makefile.rules


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_27@102310 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile.rules b/Makefile.rules
index 20e642a..1d4decc 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -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