diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-06 15:30:37 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-06 15:30:37 +0100 |
commit | fa6eb468613603bfa2571f2e456468878bfe0b95 (patch) | |
tree | aab6fbeae127acd5b49b88cb0be70bce1d433fa9 /src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java | |
parent | 7ea719da26b29976e7227b4846953d24ced709d8 (diff) | |
parent | 683d490074d93baa8a47db7ec43b7bd31145a12a (diff) | |
download | cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.tar.gz cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.tar.bz2 cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.tar.xz cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.zip |
Merged with cpptasks-1.0b5
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java')
-rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java | 7 |
1 files changed, 4 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 aeed2bb..93c3e1e 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java @@ -286,9 +286,10 @@ public abstract class CommandLineLinker extends AbstractLinker * Prepares argument list for exec command. Will return null * if command line would exceed allowable command line buffer. * + * @param task compilation task. * @param outputFile linker output file * @param sourceFiles linker input files (.obj, .o, .res) - * @param args linker arguments + * @param config linker configuration * @return arguments for runTask */ protected String[] prepareArguments( @@ -324,7 +325,7 @@ public abstract class CommandLineLinker extends AbstractLinker } for (int i = 0; i < endargs.length; i++) { allArgs[index++] = decorateLinkerOption(buf, endargs[i]); - } + } return allArgs; } @@ -338,7 +339,7 @@ public abstract class CommandLineLinker extends AbstractLinker new File(sourceFile)); // FREEHEP, return the shortest // return quoteFilename(buf, sourceFile.length() > relativePath.length() ? relativePath : sourceFile); -// FREEHEP trying with always absolute paths... +// FREEHEP trying with always absolute paths, as Windows relPaths have a tighter restriction on length than absPaths... return quoteFilename(buf, sourceFile); } |