diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-08-18 17:22:07 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-08-18 17:22:07 +0000 |
| commit | bd4b758d2dbbf2220332bae9f40b63509859e4e2 (patch) | |
| tree | 7b28187574272911230eebf00a426ee1fa505119 /Makefile.rules | |
| parent | f0646768be731fa4dfd447584ea3248727c8f90e (diff) | |
| download | llvm-bd4b758d2dbbf2220332bae9f40b63509859e4e2.tar.gz llvm-bd4b758d2dbbf2220332bae9f40b63509859e4e2.tar.bz2 llvm-bd4b758d2dbbf2220332bae9f40b63509859e4e2.tar.xz | |
To avoid errors where a non-exception .o is on the stack between a throw
and a handler, which would produce errors like:
terminate called after throwing an instance of 'std::string'
we must comment out setting -fno-exceptions until PR797 is completely
fixed. Once libraries like lib/System and lib/Support are exception free,
we can turn it back on.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29768 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules index 055baa08dc..42c367a949 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -206,6 +206,11 @@ else OPTIMIZE_OPTION := -O2 endif +# IF REQUIRES_EH=1 is specified then don't disable exceptions +#ifndef REQUIRES_EH +# CXX.Flags += -fno-exceptions +#endif + ifdef ENABLE_PROFILING BuildMode := Profile CXX.Flags := $(OPTIMIZE_OPTION) -pg -g @@ -249,11 +254,6 @@ else C.Flags += -D_DEBUG endif -# IF REQUIRES_EH=1 is specified then don't disable exceptions -ifndef REQUIRES_EH - CXX.Flags += -fno-exceptions -endif - CXX.Flags += $(CXXFLAGS) C.Flags += $(CFLAGS) CPP.BaseFlags += $(CPPFLAGS) |