From c71037861f4d63eb37406256f2ae16297a0ffe0c Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Wed, 25 Jul 2007 17:03:58 +0000 Subject: Fixed NARPLUGIN-121 --- PATCHES | 3 ++- src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java | 3 ++- 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"); -- cgit v1.2.3