diff options
author | Tanya Lattner <tonic@nondot.org> | 2010-04-25 19:18:33 +0000 |
---|---|---|
committer | Tanya Lattner <tonic@nondot.org> | 2010-04-25 19:18:33 +0000 |
commit | 079a588dd1ec237c1b36f4f28b9f29326f57edfa (patch) | |
tree | 1f62e05902af3de6e37c0ffb214f2fb2b0f30ef4 | |
parent | c529f005531919654eb01fcc86e0ba8b5174038f (diff) | |
download | llvm-079a588dd1ec237c1b36f4f28b9f29326f57edfa.zip llvm-079a588dd1ec237c1b36f4f28b9f29326f57edfa.tar.gz llvm-079a588dd1ec237c1b36f4f28b9f29326f57edfa.tar.bz2 |
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.rules | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 20e642a..1d4decc 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 |