summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2007-06-19 23:31:06 +0000
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2007-06-19 23:31:06 +0000
commit6e69fb4e8cb97445badcd1f12e5ba09560eda5a9 (patch)
tree69eae7c0d6674d2484e2aff08c04f565dac557e9
parent649b808111e65032677b923ed1886704b82775a9 (diff)
downloadcpptasks-parallel-6e69fb4e8cb97445badcd1f12e5ba09560eda5a9.tar.gz
cpptasks-parallel-6e69fb4e8cb97445badcd1f12e5ba09560eda5a9.tar.bz2
cpptasks-parallel-6e69fb4e8cb97445badcd1f12e5ba09560eda5a9.tar.xz
cpptasks-parallel-6e69fb4e8cb97445badcd1f12e5ba09560eda5a9.zip
Fixes to cpptasks
-rw-r--r--PATCHES3
-rw-r--r--src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java9
2 files changed, 11 insertions, 1 deletions
diff --git a/PATCHES b/PATCHES
index 8e7b727..f7c0484 100644
--- a/PATCHES
+++ b/PATCHES
@@ -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;