summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanya Lattner <tonic@nondot.org>2010-04-25 19:18:33 +0000
committerTanya Lattner <tonic@nondot.org>2010-04-25 19:18:33 +0000
commit079a588dd1ec237c1b36f4f28b9f29326f57edfa (patch)
tree1f62e05902af3de6e37c0ffb214f2fb2b0f30ef4
parentMerge r100936 from mainline to fix PR6760. (diff)
downloadllvm-project-079a588dd1ec237c1b36f4f28b9f29326f57edfa.tar.gz
llvm-project-079a588dd1ec237c1b36f4f28b9f29326f57edfa.tar.bz2
llvm-project-079a588dd1ec237c1b36f4f28b9f29326f57edfa.zip
Merge 102239 from mainline to fix PR6835
-gThis line, and those below, will be ignored-- M Makefile.rules llvm-svn: 102310
-rw-r--r--llvm/Makefile.rules1
1 files changed, 0 insertions, 1 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index 20e642a4505b..1d4deccc626c 100644
--- a/llvm/Makefile.rules
+++ b/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