From 6e69fb4e8cb97445badcd1f12e5ba09560eda5a9 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Tue, 19 Jun 2007 23:31:06 +0000
Subject: Fixes to cpptasks

---
 PATCHES                                           | 3 +++
 src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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;
-- 
cgit v1.2.3