From fbc1c49513afb5e8c52025ec6b3799d430d3f81b Mon Sep 17 00:00:00 2001
From: Michael Pfaff <michael@pfaff.dev>
Date: Fri, 9 Sep 2022 12:04:53 -0400
Subject: [PATCH] Clean-up macos build

---
 platform_build/macosx_ant/build.xml | 112 +++++-----------------------
 1 file changed, 17 insertions(+), 95 deletions(-)

diff --git a/platform_build/macosx_ant/build.xml b/platform_build/macosx_ant/build.xml
index 01238421..4abd75b9 100644
--- a/platform_build/macosx_ant/build.xml
+++ b/platform_build/macosx_ant/build.xml
@@ -3,15 +3,16 @@
 		<property environment="env" />
 		<!-- Ask Xcode for correct path to XCode tools -->
 		<!-- Will fail if XCode Command Line Tools are not installed on 10.7+ (Lion) -->
-		<exec executable="xcode-select" outputproperty="developer_path" errorproperty="xcode-select.error" failonerror="false" failifexecutionfails="false">
-			<arg value="-print-path" />
+		<exec executable="xcrun" outputproperty="sdk_path" errorproperty="xcode-select.error" failonerror="false" failifexecutionfails="false">
+			<arg value="--sdk" />
+			<arg value="macosx" />
+			<arg value="--show-sdk-path" />
 		</exec>
 		<!-- Default to /Developer if xcode-select fails -->
-		<condition property="developer_path" value="/Developer">
+		<condition property="sdk_path" value="/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk">
 			<isset property="xcode-select.error" />
 		</condition>
 
-		<property name="sdk_path" value="Platforms/MacOSX.platform/Developer/SDKs"/>
 		<property name="jvm_headers_path" value="include"/>
         <property name="jvm_headers_path_md" value="${jvm_headers_path}/darwin"/>
 
@@ -32,27 +33,6 @@
 			</and>
         </condition>
 
-		<!-- Choose a MacOSX SDK -->
-
-		<condition property="sdkroot" value="${developer_path}/${sdk_path}/MacOSX.sdk">
-			<and>
-				<not><isset property="sdkroot"/></not>
-				<available file="${developer_path}/${sdk_path}/MacOSX.sdk" type="dir"/>
-			</and>
-		</condition>
-		<condition property="sdkroot" value="${developer_path}/${sdk_path}/MacOSX10.9.sdk">
-			<and>
-				<not><isset property="sdkroot"/></not>
-				<available file="${developer_path}/${sdk_path}/MacOSX10.9.sdk" type="dir"/>
-			</and>
-		</condition>
-		<condition property="sdkroot" value="${developer_path}/${sdk_path}/MacOSX10.8.sdk">
-			<and>
-				<not><isset property="sdkroot"/></not>
-				<available file="${developer_path}/${sdk_path}/MacOSX10.8.sdk" type="dir"/>
-			</and>
-		</condition>
-
 		<!-- If we're on 10.7 or lower, use gcc instead of clang -->
 		<condition property="compiler" value="clang">
 			<and>
@@ -60,35 +40,22 @@
 				<available file="clang" filepath="${env.PATH}"/>
 			</and>
 		</condition>
-		<condition property="compiler" value="gcc-4.2">
-			<and>
-				<not><isset property="compiler"/></not>
-				<available file="gcc-4.2" filepath="${env.PATH}"/>
-			</and>
-		</condition>
 		<condition property="compiler" value="gcc">
 			<and>
 				<not><isset property="compiler"/></not>
 				<available file="gcc" filepath="${env.PATH}"/>
 			</and>
 		</condition>
-
-		<condition property="sdkroot" value="${developer_path}/${sdk_path}/MacOSX10.7.sdk">
+		<condition property="compiler" value="gcc-11">
 			<and>
-				<not><isset property="sdkroot"/></not>
-				<available file="${developer_path}/${sdk_path}/MacOSX10.7.sdk" type="dir"/>
+				<not><isset property="compiler"/></not>
+				<available file="gcc-11" filepath="${env.PATH}"/>
 			</and>
 		</condition>
-		<condition property="sdkroot" value="${developer_path}/${sdk_path}/MacOSX10.6.sdk">
+		<condition property="compiler" value="gcc-4.2">
 			<and>
-				<not><isset property="sdkroot"/></not>
-				<available file="${developer_path}/${sdk_path}/MacOSX10.6.sdk" type="dir"/>
-			</and>
-		</condition>
-		<condition property="sdkroot" value="${developer_path}/SDKs/MacOSx10.6.sdk"> <!-- Old XCode location -->
-			<and>
-				<not><isset property="sdkroot"/></not>
-				<available file="${developer_path}/SDKs/MacOSx10.6.sdk" type="dir"/>
+				<not><isset property="compiler"/></not>
+				<available file="gcc-4.2" filepath="${env.PATH}"/>
 			</and>
 		</condition>
 	</target>
@@ -119,7 +86,7 @@
 		</condition>
         
 		<apply dir="${objdir}" parallel="true" executable="${compiler}" os="Mac OS X" failonerror="true">
-            <arg line="${linkerflags} -exported_symbols_list lwjgl.symbols -dynamiclib -o ${lwjgl.target.natives}/${libname} -framework Foundation -weak_framework AppKit -framework Carbon -framework OpenGL -framework QuartzCore -L${jdk_lib} -ljawt -L${sdkroot}/usr/lib"/>
+            <arg line="${linkerflags} -exported_symbols_list lwjgl.symbols -dynamiclib -o ${lwjgl.target.natives}/${libname} -framework Foundation -weak_framework AppKit -framework Carbon -framework OpenGL -framework QuartzCore -L${jdk_lib} -ljawt -L${sdk_path}/usr/lib"/>
 			<fileset dir="${objdir}" includes="*.o"/>
         </apply>
         <echo message="Linked library"/>
@@ -133,62 +100,17 @@
 	<target name="nativelibrary" depends="init">
 		<echo message="       Java Home: ${java.home}"/>
 		<echo message="        Compiler: ${compiler}"/>
-		<echo message="      Mac OS SDK: ${sdkroot}"/>
+		<echo message="      Mac OS SDK: ${sdk_path}"/>
 		<echo message="JavaVM.framework: ${javavmroot}"/>
 
-		<condition property="build_x86_64" value="1">
-			<equals arg1="${compiler}" arg2="clang"/>
-		</condition>
-
 		<antcall target="-build"/>
 	</target>
 
-	<target name="-build" depends="-build_universal,-build_x86_x64"/>
-
-	<target name="-build_universal" unless="build_x86_64">
-		<antcall target="compile">
-            <param name="dstdir" location="${lwjgl.target.gen.obj}/i386"/>
-			<param name="sdkroot" location="${sdkroot}"/>
-            <param name="cflags" value="-isysroot ${sdkroot} -arch i386 -mmacosx-version-min=${macos_link_ver}"/>
-		</antcall>
+	<target name="-build">
 		<antcall target="compile">
 			<param name="dstdir" location="${lwjgl.target.gen.obj}/x86_64"/>
-			<param name="sdkroot" location="${sdkroot}"/>
-			<param name="cflags" value="-isysroot ${sdkroot} -arch x86_64 -mmacosx-version-min=${macos_link_ver}"/>
-		</antcall>
-        <exec vmlauncher="true" executable="sh" output="${lwjgl.target.gen.obj}/i386/lwjgl.symbols" failonerror="true" logError="true">
-            <arg path="platform_build/macosx_ant/build-symbol-list"/>
-			<arg path="${lwjgl.target.gen.obj}/i386"/>
-		</exec>
-        <exec vmlauncher="true" executable="sh" output="${lwjgl.target.gen.obj}/x86_64/lwjgl.symbols" failonerror="true" logError="true">
-            <arg path="platform_build/macosx_ant/build-symbol-list"/>
-			<arg path="${lwjgl.target.gen.obj}/x86_64"/>
-		</exec>
-		<antcall target="link">
-			<param name="objdir" location="${lwjgl.target.gen.obj}/i386"/>
-			<param name="libname" value="liblwjgl-i386.dylib"/>
-			<param name="linkerflags" value="-isysroot ${sdkroot} -arch i386 -mmacosx-version-min=${macos_link_ver}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="${lwjgl.target.gen.obj}/x86_64"/>
-			<param name="libname" value="liblwjgl-x86_64.dylib"/>
-			<param name="linkerflags" value="-isysroot ${sdkroot} -arch x86_64 -mmacosx-version-min=${macos_link_ver}"/>
-		</antcall>
-		<apply dir="${lwjgl.target.natives}" parallel="true" executable="lipo" os="Mac OS X" failonerror="true">
-			<arg value="-create"/>
-			<srcfile/>
-			<arg value="-output"/>
-			<arg path="liblwjgl.dylib"/>
-			<fileset file="liblwjgl-i386.dylib"/>
-			<fileset file="liblwjgl-x86_64.dylib"/>
-		</apply>
-	</target>
-
-	<target name="-build_x86_x64" if="build_x86_64">
-		<antcall target="compile">
-			<param name="dstdir" location="${lwjgl.target.gen.obj}/x86_64"/>
-			<param name="sdkroot" location="${sdkroot}"/>
-			<param name="cflags" value="-isysroot ${sdkroot} -arch x86_64 -mmacosx-version-min=${macos_link_ver}"/>
+			<param name="sdkroot" location="${sdk_path}"/>
+			<param name="cflags" value="-isysroot ${sdk_path} -arch x86_64 -mmacosx-version-min=${macos_link_ver}"/>
 		</antcall>
         <exec vmlauncher="true" executable="sh" output="${lwjgl.target.gen.obj}/x86_64/lwjgl.symbols" failonerror="true" logError="true">
             <arg path="platform_build/macosx_ant/build-symbol-list"/>
@@ -197,7 +119,7 @@
 		<antcall target="link">
 			<param name="objdir" location="${lwjgl.target.gen.obj}/x86_64"/>
 			<param name="libname" value="liblwjgl-x86_64.dylib"/>
-			<param name="linkerflags" value="-isysroot ${sdkroot} -arch x86_64 -mmacosx-version-min=${macos_link_ver}"/>
+			<param name="linkerflags" value="-isysroot ${sdk_path} -arch x86_64 -mmacosx-version-min=${macos_link_ver}"/>
 		</antcall>
 		<apply parallel="true" executable="lipo" os="Mac OS X" failonerror="true">
 			<arg value="-create"/>