diff options
| author | Sven Gothel <[email protected]> | 2013-10-25 02:12:40 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-10-25 02:12:40 +0200 |
| commit | 1410a1324c421d7f84655fc7366442d5dc9b2d1e (patch) | |
| tree | 9899e975e3f03044baefcc485ed769ac920cf436 | |
| parent | 5f44808fb34aa48bca233281983019247ed86bb6 (diff) | |
Bug 871 - Add optional xcode.clang support for all modules: Fix 'isCLANG' detection ; echo 'gcc.compat.compiler'
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 6 | ||||
| -rwxr-xr-x | make/gluegen-properties.xml | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index b726737..41b46fa 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -743,8 +743,12 @@ <equals arg1="${gcc.compat.compiler}" arg2="gcc" /> </condition> <condition property="isCLANG"> - <equals arg1="${gcc.compat.compiler}" arg2="clang" /> + <or> + <equals arg1="${gcc.compat.compiler}" arg2="clang" /> + <equals arg1="${gcc.compat.compiler}" arg2="xcode.clang" /> + </or> </condition> + <echo message="gcc.compat.compiler=${gcc.compat.compiler}" /> <echo message="GCC=${isGCC}" /> <echo message="CLANG=${isCLANG}" /> diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index cac32bb..59a133d 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -84,6 +84,7 @@ <!-- maybe overriden, e.g. with "clang" --> <property name="gcc.compat.compiler" value="gcc"/> + <echo message="gcc.compat.compiler=${gcc.compat.compiler}" /> <condition property="win32.c.compiler" value="mingw64"> <and> |