diff --git a/bindings/java/hyperic_jni/jni-build.xml b/bindings/java/hyperic_jni/jni-build.xml index 034ec21f..00229756 100644 --- a/bindings/java/hyperic_jni/jni-build.xml +++ b/bindings/java/hyperic_jni/jni-build.xml @@ -25,7 +25,6 @@ USA. - @@ -357,7 +356,7 @@ USA. - + @@ -372,7 +371,7 @@ USA. - + diff --git a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java index a8bd62f2..1f28b19f 100644 --- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java +++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java @@ -97,13 +97,28 @@ public class ArchNameTask extends Task { }); if (sdks != null) { Arrays.sort(sdks); - final String prop = "uni.sdk"; + String prop = "uni.sdk"; String sdk = getProject().getProperty(prop); + String defaultMin = "10.3"; + if (sdk == null) { - sdk = sdks[sdks.length-1].getPath(); + int ix = sdks.length-1; + sdk = sdks[ix].getPath(); + if ((sdk.indexOf("10.6") != -1) && (ix > 0)) { + sdk = sdks[ix-1].getPath(); //downgrade due to 64-bit ppc issues XXX + defaultMin = "10.5"; + } getProject().setProperty(prop, sdk); } System.out.println("Using SDK=" + sdk); + + prop = "osx.min"; + String min = getProject().getProperty(prop); + if (min == null) { + min = defaultMin; + getProject().setProperty(prop, min); + } + System.out.println("Using -mmacosx-version-min=" + min); } } }