From bc058a6e536ba36e9dcc723a9359bcbda5087c5d Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Wed, 25 Jul 2007 17:43:54 +0000 Subject: Small mod --- PATCHES | 1 + src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/PATCHES b/PATCHES index 4b4ba15..17bb7bc 100644 --- a/PATCHES +++ b/PATCHES @@ -67,6 +67,7 @@ - [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/sun/ForteCCLinker.java] if last was -Bstatic reset it to -Bdynamic so that libc and libm can be found as shareables - [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/gcc/AbstractLdLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java index e6f4b8a..617081c 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java @@ -160,6 +160,14 @@ public abstract class AbstractLdLinker extends CommandLineLinker { endargs.addElement(buf.toString()); } } + +// BEGINFREEHEP if last was -Bstatic reset it to -Bdynamic so that libc and libm can be found as shareables +System.err.println(previousLibraryType+" "+isDarwin()); + if ("static".equals(previousLibraryType) && !isDarwin()) { + endargs.addElement("-Bdynamic"); + } +// ENDFREEHEP + String rc[] = new String[libnames.size()]; for (int i = 0; i < libnames.size(); i++) { rc[i] = (String) libnames.elementAt(i); -- cgit v1.2.3