summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2007-04-20 22:37:34 +0000
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2007-04-20 22:37:34 +0000
commit18055a93c5204defc2dd3bb1d9f577a28b25ea43 (patch)
treecfa8b534c4ae5161ac2435d8a989ae45fd51e6b2
parent8a32b8fc255b05947af55c5d9c64c788121a8f2c (diff)
downloadcpptasks-parallel-18055a93c5204defc2dd3bb1d9f577a28b25ea43.tar.gz
cpptasks-parallel-18055a93c5204defc2dd3bb1d9f577a28b25ea43.tar.bz2
cpptasks-parallel-18055a93c5204defc2dd3bb1d9f577a28b25ea43.tar.xz
cpptasks-parallel-18055a93c5204defc2dd3bb1d9f577a28b25ea43.zip
unquote framework on macos x
-rw-r--r--PATCHES3
-rw-r--r--src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java3
2 files changed, 5 insertions, 1 deletions
diff --git a/PATCHES b/PATCHES
index d77a508..ffc37ea 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1,4 +1,7 @@
*** Changes marked with FREEHEP.
+cpptasks-20051015-patched-1.4-SNAPSHOT
+- unquoted -framework on MacOX X.
+
cpptasks-20051015-patched-1.3
- protected return of net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler.run().
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
index 638e06d..cb4c125 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
@@ -139,7 +139,8 @@ public abstract class AbstractLdLinker extends CommandLineLinker {
"framework".equals(set.getType().getValue()) &&
isDarwin()) {
buf.setLength(0);
- buf.append("-framework ");
+// buf.append("-framework ");
+ endargs.addElement("-framework");
}
int initialLength = buf.length();
for (int j = 0; j < libs.length; j++) {