From a65cc99054a5a6684784bf9a9e8c13fe866b81ad Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 24 Oct 2013 19:59:14 +0200
Subject: 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).

+++
---
 .../java/net/sf/antcontrib/cpptasks/CompilerEnum.java  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java')

diff --git a/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
index 28eebda..e7af352 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
@@ -1,5 +1,5 @@
 /*
- * 
+ *
  * Copyright 2002-2008 The Ant-Contrib project
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,7 +46,7 @@ import net.sf.antcontrib.cpptasks.openwatcom.OpenWatcomFortranCompiler;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 /**
  * Enumeration of supported compilers
- * 
+ *
  * <table width="100%" border="1"> <thead>Supported compilers </thead>
  * <tr>
  * <td>gcc (default)</td>
@@ -57,6 +57,10 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * <td>clang / llvm C compiler</td>
  * </tr>
  * <tr>
+ * <td>xcode.clang</td>
+ * <td>Xcode clang / llvm C compiler (via xcrun)</td>
+ * </tr>
+ * <tr>
  * <td>g++</td>
  * <td>GCC C++ compiler</td>
  * </tr>
@@ -65,6 +69,10 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * <td>clang++ / llvm C++ compiler</td>
  * </tr>
  * <tr>
+ * <td>xcode.clang++</td>
+ * <td>Xcode clang++ / llvm C++ compiler (via xcrun)</td>
+ * </tr>
+ * <tr>
  * <td>c++</td>
  * <td>GCC C++ compiler</td>
  * </tr>
@@ -189,9 +197,9 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * <td>GNU windres resource compiler</td>
  * </tr>
  * </table>
- * 
+ *
  * @author Curt Arnold, et.al.
- *  
+ *
  */
 public class CompilerEnum extends EnumeratedAttribute {
     private final static ProcessorEnumValue[] compilers = new ProcessorEnumValue[]{
@@ -199,6 +207,8 @@ public class CompilerEnum extends EnumeratedAttribute {
             new ProcessorEnumValue("g++", GccCCompiler.getGppInstance()),
             new ProcessorEnumValue("clang", GccCCompiler.getCLangInstance()),
             new ProcessorEnumValue("clang++", GccCCompiler.getCPPLangInstance()),
+            new ProcessorEnumValue("xcode.clang", GccCCompiler.getXCodeCLangInstance()),
+            new ProcessorEnumValue("xcode.clang++", GccCCompiler.getXCodeCPPLangInstance()),
             new ProcessorEnumValue("c++", GccCCompiler.getCppInstance()),
             new ProcessorEnumValue("g77", GccCCompiler.getG77Instance()),
             new ProcessorEnumValue("msvc", DevStudioCCompiler.getInstance()),
-- 
cgit v1.2.3