summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/sf/antcontrib/cpptasks/arm
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-10-24 19:59:14 +0200
committerSven Gothel <[email protected]>2013-10-24 19:59:14 +0200
commita65cc99054a5a6684784bf9a9e8c13fe866b81ad (patch)
tree23348f898a34d48fb90ffeee67bf9660e68581bd /src/main/java/net/sf/antcontrib/cpptasks/arm
parent828c0e4ce45fb209ecf4355c8572ef3931228206 (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/arm')
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java2
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java2
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
index 11004ad..455adba 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
@@ -109,7 +109,7 @@ public class ADSCCompiler extends CommandLineCCompiler {
*/
private ADSCCompiler(String command, boolean newEnvironment, Environment env) {
super(command, "-vsn", sourceExtensions, headerExtensions, ".o", false,
- null, newEnvironment, env);
+ false, null, newEnvironment, env);
}
/**
* {@inheritDoc}
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
index 65c430f..fa8397f 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
@@ -40,7 +40,7 @@ public class ADSLibrarian extends CommandLineLinker {
private ADSLibrarian()
{
super("armar",null,
- new String[] { ".o" }, new String[0], ".lib", false, null);
+ new String[] { ".o" }, new String[0], ".lib", false, false, null);
}
/* (non-Javadoc)
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
index fda52fa..55f6682 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
@@ -40,7 +40,7 @@ public class ADSLinker extends CommandLineLinker {
}
private ADSLinker(String outputSuffix) {
super("armlink", "-vsn", new String[]{".o", ".lib", ".res"},
- new String[]{".map", ".pdb", ".lnk"}, outputSuffix, false, null);
+ new String[]{".map", ".pdb", ".lnk"}, outputSuffix, false, false, null);
}
/*
* (non-Javadoc)