SF.net SVN: ant-contrib: [153] cpptasks/trunk/src/main/java/net/sf/ antcontrib/cpptasks/gcc/AbstractLdLinker.java

Revision: 153
          http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=153&view=rev
Author:   carnold
Date:     2008-02-13 09:23:14 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
Use relative paths on -L options which helps cygwin

Modified Paths:
--------------
    cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java

Modified: cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
===================================================================
--- cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java	2008-02-12 21:17:03 UTC (rev 152)
+++ cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java	2008-02-13 17:23:14 UTC (rev 153)
@@ -101,13 +101,19 @@
             LibrarySet set = libsets[i];
             File libdir = set.getDir(null);
             String[] libs = set.getLibs();
-            if (libdir != null) {
+            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()) &&
                                                 isDarwin()) {
-                            endargs.addElement("-F" + libdir.getAbsolutePath());
+                            endargs.addElement("-F" + relPath);
                     } else {
-                            endargs.addElement("-L" + libdir.getAbsolutePath());
+                            endargs.addElement("-L" + relPath);
                     }
             }
             //


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/