From 672f3b3f0955cb8b72be0441abf941b14a8d2439 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Wed, 25 Jul 2007 18:09:18 +0000 Subject: Fixed NARPLUGIN-131 --- src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.3