Make this work on the M1.
Signed-off-by: Keith Packard <keithp@keithp.com>
esac
# Check for java
-if ls "$JVM" | grep -q adopt; then
- echo "Adopt OpenJDK already present"
+if ls "$JVM" | grep -q temurin; then
+ echo "Adoptium already present"
else
open https://adoptium.net/
osascript -e 'display dialog "Install Java from https://adoptium.net then click Continue" buttons {"Continue"} default button 1 with title "Install Java"' >/dev/null
# -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
XCODE=/Applications/Xcode.app
-SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk
+SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
MINVERSION=10.5
OS_LIB_CFLAGS=\
- -DDARWIN -DPOSIX_TTY -arch x86_64 -isysroot $(SDK) \
+ -DDARWIN -DPOSIX_TTY -arch x86_64 -arch arm64 -isysroot $(SDK) \
-mmacosx-version-min=10.5 \
-iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
-iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \