diff options
| -rw-r--r-- | README.txt | 2 | ||||
| -rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java | 2 | ||||
| -rw-r--r-- | src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -5,7 +5,7 @@ Modified version of ant contrib cpptasks, used in the freehep/maven-nar-plugin. * cpptasks-1.0-beta-5-parallel-1-SNAPSHOT - merged with cpptasks-1.0b5.tar.gz -+++ some problems with tests may occur on other platforms than MacOS X. +- See NAR-103 for tests that have been changed * cpptasks-1.0-beta-4-parallel-5 diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java index f9e4c0b..3497aaf 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java @@ -255,7 +255,9 @@ public final class GccCCompiler extends GccCompatibleCCompiler { public Linker getLinker(LinkType linkType) { return GccLinker.getInstance().getLinker(linkType); } + // BEGINFREEHEP public int getMaximumCommandLength() { return isWindows() ? 20000 : Integer.MAX_VALUE; } + // ENDFREEHEP } diff --git a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java index 27ffea0..41a736b 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java @@ -235,7 +235,7 @@ public class TestAbstractLdLinker extends TestCase { Vector endargs = new Vector(); String[] rc = linker.addLibrarySets(task, sets, preargs, midargs, endargs); - for (int i=0; i<endargs.size(); i++) System.err.println(endargs.get( i )); +// for (int i=0; i<endargs.size(); i++) System.err.println(endargs.get( i )); // NAR-103 // BEGINFREEHEP if (System.getProperty("os.name").equals("Mac OS X")) { |