summaryrefslogtreecommitdiff
path: root/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2006-06-12 20:20:58 +0000
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2006-06-12 20:20:58 +0000
commit760de60a50beffd524d1e8dd4997055c8bc0f010 (patch)
tree829a9e466970a013778616eb95a1dc5c93edeaaa /src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
parent5e2f6d72c482081af1ded500107397c2583df43c (diff)
downloadcpptasks-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/GppLinker.java')
-rw-r--r--src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
index 84421f1..6248e00 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
@@ -46,6 +46,9 @@ public class GppLinker extends AbstractLdLinker {
discardFiles, "", "", false, null);
private static final GppLinker machDllLinker = new GppLinker("gcc",
objFiles, discardFiles, "lib", ".dylib", false, null);
+// FREEHEP
+ private static final GppLinker machJNILinker = new GppLinker("gcc",
+ objFiles, discardFiles, "lib", ".jnilib", false, null);
private static final GppLinker machPluginLinker = new GppLinker("gcc",
objFiles, discardFiles, "lib", ".bundle", false, null);
public static GppLinker getInstance() {
@@ -186,6 +189,14 @@ public class GppLinker extends AbstractLdLinker {
if (type.isStaticLibrary()) {
return GccLibrarian.getInstance();
}
+// FREEHEP
+ if (type.isJNIModule()) {
+ if (isDarwin()) {
+ return machJNILinker;
+ } else {
+ return dllLinker;
+ }
+ }
if (type.isPluginModule()) {
if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
return machPluginLinker;