Attempt to fix CI

java-native-access · Jan 15, 2021 · fe18e87 · fe18e87
1 parent 8d9e66f
commit fe18e87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -954,11 +954,16 @@ osname=macosx;processor=x86;processor=x86-64;processor=aarch64;processor=ppc
       </and>
     </condition>
     <!-- Multiple SDKs is common; find the most recent (sort -V requires 10.12+) -->
-    <exec executable="sh" dir="${sdk-parent}" outputproperty="sdk-latest" unless:set="make.SDKROOT">
+    <condition property="darwin.sort" value="true">
+        <matches string="${os.prefix}" pattern="^darwin-"/>
+    </condition>
+    <exec executable="sh" dir="${sdk-parent}" outputproperty="sdk-latest" if:set="darwin.sort" unless:set="make.SDKROOT">
       <arg value="-c"/>
       <arg line="&quot;ls -d MacOSX10.*.sdk | sort -t &quot;.&quot; -k2 -n | tail -1&quot;"/>
     </exec>
-    <property name="make.SDKROOT" value="SDKROOT=${sdk-parent}/${sdk-latest}"/>
+    <condition property="make.SDKROOT" value="SDKROOT=${sdk-parent}/${sdk-latest}"/>
+      <isset property="sdk-latest"/>
+    </condition>
 
     <!-- Windows' drive letters and spaces in absolute paths wreak havoc on
          make -->

diff --git a/native/build.xml b/native/build.xml
@@ -307,12 +307,16 @@
             </and>
         </condition>
         <!-- Multiple SDKs is common; find the most recent (sort -V requires 10.12+) -->
-        <exec executable="sh" dir="${sdk-parent}" outputproperty="sdk-latest" unless:set="make.SDKROOT">
+        <condition property="darwin.sort" value="true">
+            <matches string="${os.prefix}" pattern="^darwin-"/>
+        </condition>
+        <exec executable="sh" dir="${sdk-parent}" outputproperty="sdk-latest" if:set="darwin.sort" unless:set="make.SDKROOT">
             <arg value="-c"/>
             <arg line="&quot;ls -d MacOSX10.*.sdk | sort -t &quot;.&quot; -k2 -n | tail -1&quot;"/>
         </exec>
-        <property name="make.SDKROOT" value="SDKROOT=${sdk-parent}/${sdk-latest}"/>
-        <echo level="info" message="make.SDKROOT: ${make.SDKROOT}"/>
+        <condition property="make.SDKROOT" value="SDKROOT=${sdk-parent}/${sdk-latest}"/>
+            <isset property="sdk-latest"/>
+        </condition>
 
         <!-- Windows drive letters, separator and spaces in absolute paths wreak havoc on make -->
         <condition property="make.BUILD"