From 6a97c81d40adc13ebc59966f72fdacdb326b7758 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Fri, 27 Jul 2007 23:01:14 +0000 Subject: Fixed NARPLUGIN-135 --- PATCHES | 3 +++ src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java | 3 ++- src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PATCHES b/PATCHES index 959fc2c..7ff1125 100644 --- a/PATCHES +++ b/PATCHES @@ -26,6 +26,9 @@ - [src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java] limit command line length to 32000. - [src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java] limit command line length to 32000. - [src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java] limit command line length to 32000. +- [src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java] limit command line for Windows to 20000. +- [src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java] limit command line for Windows to 20000. + ** dll for g++ on windows changes - [src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java] Added isWindows() diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java index 8838242..32e6e7e 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java @@ -252,7 +252,8 @@ public abstract class AbstractLdLinker extends CommandLineLinker { return patterns; } public int getMaximumCommandLength() { - return Integer.MAX_VALUE; +// FREEHEP + return isWindows() ? 20000 : Integer.MAX_VALUE; } public String[] getOutputFileNames(String baseName, VersionInfo versionInfo) { String[] baseNames = super.getOutputFileNames(baseName, versionInfo); diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java index 409655b..1abdbec 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java @@ -256,6 +256,7 @@ public final class GccCCompiler extends GccCompatibleCCompiler { return GccLinker.getInstance().getLinker(linkType); } public int getMaximumCommandLength() { - return Integer.MAX_VALUE; +// FREEHEP + return isWindows() ? 20000 : Integer.MAX_VALUE; } } -- cgit v1.2.3