diff options
author | Sven Gothel <[email protected]> | 2013-10-24 19:59:14 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-10-24 19:59:14 +0200 |
commit | a65cc99054a5a6684784bf9a9e8c13fe866b81ad (patch) | |
tree | 23348f898a34d48fb90ffeee67bf9660e68581bd /src/main/java/net/sf/antcontrib/cpptasks/sun | |
parent | 828c0e4ce45fb209ecf4355c8572ef3931228206 (diff) |
Fix Bug 871 - Add optional xcode.clang support for all modules (Extends Bug 837 w/ xcode's xcrun)
Add 'isXCoderun' into the OO chain CommanLine[Compiler|Linker]
up-to [Gcc|Gpp]Linker and GccCCompiler.
Xcode's xcrun is now triggered via using the commands (linker and compiler):
xcode.clang
xcode.clang++
More could be added later ..
+++
[Gcc|Gpp]Linker are derived from GnuLinker
to reuse common code and to fix GppLinker (align to GccLinker).
+++
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/sun')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java index 4ac8ac1..00a51ba 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java @@ -41,8 +41,8 @@ public class C89CCompiler extends CommandLineCCompiler { } private C89CCompiler(boolean newEnvironment, Environment env) { super("c89", null, new String[]{".c", ".cc", ".cpp", ".cxx", ".c++"}, - new String[]{".h", ".hpp"}, ".o", false, null, newEnvironment, - env); + new String[]{".h", ".hpp"}, ".o", false, false, null, + newEnvironment, env); } protected void addImpliedArgs( final Vector args, diff --git a/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java index 6c41c89..58c5396 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java @@ -41,7 +41,7 @@ public final class C89Linker extends CommandLineLinker { private String outputPrefix; private C89Linker(String outputPrefix, String outputSuffix) { super("ld", "/bogus", new String[]{".o", ".a", ".lib", ".x"}, - new String[]{}, outputSuffix, false, null); + new String[]{}, outputSuffix, false, false, null); this.outputPrefix = outputPrefix; } protected void addBase(long base, Vector args) { diff --git a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java index 9422e49..7c4511e 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java @@ -50,8 +50,8 @@ public final class ForteCCCompiler extends GccCompatibleCCompiler { */ private ForteCCCompiler(String command, String[] sourceExtensions, String[] headerExtensions) { - super(command, "-V", sourceExtensions, headerExtensions, false, null, - false, null); + super(command, "-V", sourceExtensions, headerExtensions, false, false, + null, false, null); } public void addImpliedArgs(final Vector args, final boolean debug, diff --git a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java index 47d2155..746fd97 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java @@ -44,7 +44,7 @@ public final class ForteCCLinker extends AbstractLdLinker { private ForteCCLinker(String command, String[] extensions, String[] ignoredExtensions, String outputPrefix, String outputSuffix) { super(command, "-V", extensions, ignoredExtensions, outputPrefix, - outputSuffix, false, null); + outputSuffix, false, false, null); } public void addImpliedArgs(boolean debug, LinkType linkType, Vector args) { if (debug) { |