From 760de60a50beffd524d1e8dd4997055c8bc0f010 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Mon, 12 Jun 2006 20:20:58 +0000
Subject: Latest on gpp linker

---
 src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java')

diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
index 227d446..be85124 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
@@ -43,6 +43,9 @@ public class GccLinker extends AbstractLdLinker {
             discardFiles, "", "", false, null);
     private static final GccLinker machBundleLinker = new GccLinker("gcc",
             objFiles, discardFiles, "lib", ".bundle", false, null);
+// FREEHEP
+    private static final GccLinker machJNILinker = new GccLinker("gcc",
+            objFiles, discardFiles, "lib", ".jnilib", false, null);
     private static final GccLinker machDllLinker = new GccLinker("gcc",
             objFiles, discardFiles, "lib", ".dylib", false, null);
     public static GccLinker getInstance() {
@@ -193,7 +196,11 @@ public class GccLinker extends AbstractLdLinker {
         }
 // FREEHEP
         if (type.isJNIModule()) {
-            return dllLinker;
+            if (isDarwin()) {
+                return machJNILinker;
+            } else {
+                return dllLinker;
+            }
         }
         if (type.isPluginModule()) {
             if (isDarwin()) {
-- 
cgit v1.2.3