diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2007-07-07 15:13:04 +0000 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2007-07-07 15:13:04 +0000 |
| commit | add8fbe1f556a1cc8b1299edf9634c8e769fefd2 (patch) | |
| tree | bebfbd2905dc972f28fe2ebd6c61115a9007e19a | |
| parent | 2dac20493cf190fb56f04d1fe22f58c30eac1869 (diff) | |
| download | cpptasks-parallel-add8fbe1f556a1cc8b1299edf9634c8e769fefd2.tar.gz cpptasks-parallel-add8fbe1f556a1cc8b1299edf9634c8e769fefd2.tar.bz2 cpptasks-parallel-add8fbe1f556a1cc8b1299edf9634c8e769fefd2.tar.xz cpptasks-parallel-add8fbe1f556a1cc8b1299edf9634c8e769fefd2.zip | |
Removed quoting from -framework
| -rw-r--r-- | PATCHES | 1 | ||||
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java | 2 | ||||
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -4,6 +4,7 @@ ** Misc. - [src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java] no more need for -prebind as of 10.4 +- [src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java] removed trailing space after "-framework" to avoid quoting - [src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java] added -shared-libgcc/-static-libgcc for linking gcc and c++. - [src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java] added -dynamic as a valid option to GccLinker - [src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java] no -Bstatic for Darwin and no -Bdynamic for framework diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java index 96d85c0..dcff759 100644 --- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java +++ b/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java @@ -324,7 +324,7 @@ public abstract class CommandLineLinker extends AbstractLinker } for (int i = 0; i < endargs.length; i++) { allArgs[index++] = decorateLinkerOption(buf, endargs[i]); - } + } return allArgs; } diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java index 5b743d3..e6f4b8a 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java @@ -142,8 +142,8 @@ public abstract class AbstractLdLinker extends CommandLineLinker { "framework".equals(set.getType().getValue()) && isDarwin()) { buf.setLength(0); -// FREEHEP - endargs.addElement("-framework "); +// FREEHEP, added as endarg w/o trailing space to avoid quoting! + endargs.addElement("-framework"); } int initialLength = buf.length(); for (int j = 0; j < libs.length; j++) { |