From 2dac20493cf190fb56f04d1fe22f58c30eac1869 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Fri, 6 Jul 2007 19:06:29 +0000 Subject: Fixed NARPLUGIN-106 --- src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java') diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java index 77d8df5..96d85c0 100644 --- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java +++ b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java @@ -145,10 +145,10 @@ public abstract class CommandLineLinker extends AbstractLinker String[] libnames = null; LibrarySet[] libsets = specificDef.getActiveLibrarySets(defaultProviders,1); - // FREEHEP: check if runtime was added without any present libs - if (linkType.callAddLibrarySets || (libsets.length > 0)) { +// FREEHEP call at all times +// if (libsets.length > 0) { libnames = addLibrarySets(task, libsets, preargs, midargs, endargs); - } +// } StringBuffer buf = new StringBuffer(getIdentifier()); for (int i = 0; i < 3; i++) { @@ -256,7 +256,7 @@ public abstract class CommandLineLinker extends AbstractLinker // // if command length exceeds maximum - // (1024 for Windows) then create a temporary + // then create a temporary // file containing everything but the command name if(commandLength >= this.getMaximumCommandLength()) { try { @@ -336,7 +336,7 @@ public abstract class CommandLineLinker extends AbstractLinker String outputDir, String sourceFile) { String relativePath = CUtil.getRelativePath(outputDir, new File(sourceFile)); - // FREEHEP - take the shortest of the two (Windows file length limitation) +// FREEHEP, return the shortest return quoteFilename(buf, sourceFile.length() > relativePath.length() ? relativePath : sourceFile); } -- cgit v1.2.3