summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2007-07-25 17:03:58 +0000
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2007-07-25 17:03:58 +0000
commitc71037861f4d63eb37406256f2ae16297a0ffe0c (patch)
tree8af597c4cd3d61796e77d7efc9bf0bf253e98154
parent31b6bd20925883e58f6bdb04bf42cdc6a5788f67 (diff)
downloadcpptasks-parallel-c71037861f4d63eb37406256f2ae16297a0ffe0c.tar.gz
cpptasks-parallel-c71037861f4d63eb37406256f2ae16297a0ffe0c.tar.bz2
cpptasks-parallel-c71037861f4d63eb37406256f2ae16297a0ffe0c.tar.xz
cpptasks-parallel-c71037861f4d63eb37406256f2ae16297a0ffe0c.zip
Fixed NARPLUGIN-121
-rw-r--r--PATCHES3
-rw-r--r--src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/PATCHES b/PATCHES
index 8a46cd8..4b4ba15 100644
--- a/PATCHES
+++ b/PATCHES
@@ -3,7 +3,7 @@
* cpptasks-1.0-beta-4-parallel-1-SNAPSHOT
** Misc.
-- [src/net/sf/antcontrib/cpptasks/SubsyetemEnum.java] changed default subsystem from "gui" into "console"
+- [src/net/sf/antcontrib/cpptasks/SubsystemEnum.java] changed default subsystem from "gui" into "console"
- [src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java] no more need for -prebind as of 10.4
- [src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java] removed trailing space after "-framework" to avoid quoting
- [src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java] added -shared-libgcc/-static-libgcc for linking gcc and c++.
@@ -66,6 +66,7 @@
** sun c and fortran compiles
- [src/net/sf/antcontrib/cpptasks/sun/ForteCCompiler.java] added (suncc)
- [src/net/sf/antcontrib/cpptasks/sun/ForteF77Compiler.java] added (sunf77)
+- [src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java] changed -static into -staticlib=%all
- [src/net/sf/antcontrib/cpptasks/CompilerEnum] Added the above (suncc, sunf77).
** bug [ 1109917 ] g++ linker does not add runtime w/o other libs referenced
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java b/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
index 47d2155..91ec3d1 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
@@ -51,7 +51,8 @@ public final class ForteCCLinker extends AbstractLdLinker {
args.addElement("-g");
}
if (linkType.isStaticRuntime()) {
- args.addElement("-static");
+// FREEHEP changed -static
+ args.addElement("-staticlib=%all");
}
if (linkType.isSharedLibrary()) {
args.addElement("-G");