diff options
| author | Sven Gothel <[email protected]> | 2019-08-16 11:57:48 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-16 11:57:48 +0200 |
| commit | 7f350097c4ac502982f7e6961181d01304bc5de9 (patch) | |
| tree | 1be42bbd7748b5762d2f50e1f98327a4c430239e /make/gluegen-cpptasks-base.xml | |
| parent | e44b9364353a6173598eb98d276795d77cc4456c (diff) | |
| parent | 5f9c1435ab06c7b620befa8677fc23080dac0ce2 (diff) | |
Merge branch 'java11'
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 05f648a..7aee9c9 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -219,15 +219,7 @@ <!-- NOTE: the values of the macos<arch> attributes will not be overridden if already set externally --> <property name="macosppc" value="false" /> <property name="macosx64" value="true" /> - <!-- No 32bit binaries on OSX since Java7 --> - <condition property="macosx32" value="false" else="true"> - <or> - <contains string="${ant.java.version}" substring="1.7" casesensitive="false" /> - <contains string="${ant.java.version}" substring="1.8" casesensitive="false" /> - <contains string="${ant.java.version}" substring="1.9" casesensitive="false" /> - <contains string="${ant.java.version}" substring="2.0" casesensitive="false" /> - </or> - </condition> + <property name="macosx32" value="false" /> <!-- we disable 32bit on OSX for good now --> <!-- Need a way to be able to disable the macosx64 property specification in a build.xml --> <condition property="use.macosppc"> |