diff options
| -rw-r--r-- | PATCHES | 3 | ||||
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java | 9 |
2 files changed, 11 insertions, 1 deletions
@@ -1,4 +1,7 @@ *** Changes marked with FREEHEP. +1.5-SNAPSHOT +- g++ linking now includes option -fexceptions + cpptasks-20051015-patched-1.4 - unquoted -framework on MacOX X. diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java index ed18581..7b9af5f 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java @@ -90,8 +90,15 @@ public class GppLinker extends AbstractLdLinker { gccLibrary = "-static-libgcc"; } else { runtimeLibrary = "-lstdc++"; - gccLibrary = "-shared-libgcc"; +// FIXME, needed to add exceptions here for MacOS X. + gccLibrary = "-fexceptions"; } + } else { + if (linkType.isStaticRuntime()) { + gccLibrary = "-static-libgcc"; + } else { + gccLibrary = "-shared-libgcc"; + } } // FREEHEP: set flag linkType.callAddLibrarySets = true; |