Merge 102239 from mainline to fix PR6835

-gThis line, and those below, will be ignored--

M    Makefile.rules

llvm-svn: 102310

llvm/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