1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
index 86594fa..93c3e1e 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
@@ -145,9 +145,10 @@ public abstract class CommandLineLinker extends AbstractLinker
 
       String[] libnames = null;
       LibrarySet[] libsets = specificDef.getActiveLibrarySets(defaultProviders,1);
-      if (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++) {
@@ -336,7 +337,10 @@ public abstract class CommandLineLinker extends AbstractLinker
       String outputDir, String sourceFile) {
       String relativePath = CUtil.getRelativePath(outputDir,
         new File(sourceFile));
-      return quoteFilename(buf,relativePath);
+// FREEHEP, return the shortest
+//      return quoteFilename(buf, sourceFile.length() > relativePath.length() ? relativePath : sourceFile);
+// FREEHEP trying with always absolute paths, as Windows relPaths have a tighter restriction on length than absPaths...
+      return quoteFilename(buf, sourceFile);
     }
 
     /**