diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2007-07-25 18:09:18 +0000 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2007-07-25 18:09:18 +0000 |
commit | 672f3b3f0955cb8b72be0441abf941b14a8d2439 (patch) | |
tree | 7c2307b069f1c8faa0aad5d618312c7a76eb9d3f /src | |
parent | bc058a6e536ba36e9dcc723a9359bcbda5087c5d (diff) | |
download | cpptasks-parallel-672f3b3f0955cb8b72be0441abf941b14a8d2439.tar.gz cpptasks-parallel-672f3b3f0955cb8b72be0441abf941b14a8d2439.tar.bz2 cpptasks-parallel-672f3b3f0955cb8b72be0441abf941b14a8d2439.tar.xz cpptasks-parallel-672f3b3f0955cb8b72be0441abf941b14a8d2439.zip |
Fixed NARPLUGIN-131
Diffstat (limited to 'src')
-rw-r--r-- | src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java index 617081c..8838242 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java @@ -162,8 +162,7 @@ public abstract class AbstractLdLinker extends CommandLineLinker { } // 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()) { + if ((previousLibraryType != null) && previousLibraryType.getValue().equals("static") && !isDarwin()) { endargs.addElement("-Bdynamic"); } // ENDFREEHEP |