diff options
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java')
| -rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java index 940d8bc..75ddcc7 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java @@ -101,12 +101,12 @@ public abstract class AbstractLdLinker extends CommandLineLinker { LibrarySet set = libsets[i]; File libdir = set.getDir(null); String[] libs = set.getLibs(); - if (libdir != null) {
- String relPath = libdir.getAbsolutePath();
- File outputFile = task.getOutfile();
- if (outputFile != null && outputFile.getParentFile() != null) {
- relPath = CUtil.getRelativePath(
- outputFile.getParentFile().getAbsolutePath(), libdir);
+ if (libdir != null) { + String relPath = libdir.getAbsolutePath(); + File outputFile = task.getOutfile(); + if (outputFile != null && outputFile.getParentFile() != null) { + relPath = CUtil.getRelativePath( + outputFile.getParentFile().getAbsolutePath(), libdir); } if (set.getType() != null && "framework".equals(set.getType().getValue()) && @@ -272,8 +272,8 @@ public abstract class AbstractLdLinker extends CommandLineLinker { * linker output file * @param sourceFiles * linker input files (.obj, .o, .res) - * @param args - * linker arguments + * @param config + * linker configuration * @return arguments for runTask */ public String[] prepareArguments(CCTask task, String outputDir, |