diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2006-06-12 20:20:58 +0000 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2006-06-12 20:20:58 +0000 |
| commit | 760de60a50beffd524d1e8dd4997055c8bc0f010 (patch) | |
| tree | 829a9e466970a013778616eb95a1dc5c93edeaaa /src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java | |
| parent | 5e2f6d72c482081af1ded500107397c2583df43c (diff) | |
| download | cpptasks-parallel-760de60a50beffd524d1e8dd4997055c8bc0f010.tar.gz cpptasks-parallel-760de60a50beffd524d1e8dd4997055c8bc0f010.tar.bz2 cpptasks-parallel-760de60a50beffd524d1e8dd4997055c8bc0f010.tar.xz cpptasks-parallel-760de60a50beffd524d1e8dd4997055c8bc0f010.zip | |
Latest on gpp linker
Diffstat (limited to 'src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java')
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java | 9 |
1 files changed, 8 insertions, 1 deletions
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()) { |