Don't restrict to 10.9/10.10 on darwin We're trying to switch these to a minimum 10.13 builder, and increasingly need to debug on modern versions, so it no longer makes sense to have this restriction. Test: Ran build-openjdk11-darwin.sh on Big Sur Change-Id: I06d17fcaaac7d851883d6bfcfb017487ff3dd3b5
diff --git a/build-jetbrainsruntime-darwin.sh b/build-jetbrainsruntime-darwin.sh index ff060f7..46dc45b 100755 --- a/build-jetbrainsruntime-darwin.sh +++ b/build-jetbrainsruntime-darwin.sh
@@ -59,10 +59,6 @@ shift $(($OPTIND-1)) (($#==0)) || usage -declare -r sdk_version=$(xcrun --show-sdk-version) -[[ "${sdk_version}" == "10.9" || "${sdk_version}" == "10.10" ]] || \ - { echo "Xcode sdk version 10.9 or 10.10 is required"; exit 1; } - declare -r out_path=$(make_target_dir "${OUT_DIR:-"out"}") declare -r sysroot=$(xcrun --show-sdk-path) declare -r build_dir="$out_path/build" @@ -117,4 +113,4 @@ --module-path="${build_dir}/images/jdk/jmods" \ --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.aot,jdk.attach,jdk.charsets,jdk.compiler,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.hotspot.agent,jdk.httpserver,jdk.internal.ed,jdk.internal.jvmstat,jdk.internal.le,jdk.internal.vm.ci,jdk.internal.vm.compiler,jdk.internal.vm.compiler.management,jdk.javadoc,jdk.jdi,jdk.jdwp.agent,jdk.jfr,jdk.jlink,jdk.jsobject,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.pack,jdk.scripting.nashorn,jdk.scripting.nashorn.shell,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.xml.dom,jdk.zipfs \ --output "${build_dir}/java-runtime" -(cd "${build_dir}/java-runtime" && zip -9rDy${quiet:+q} "${dist_dir}/jdk-runtime.zip" .) \ No newline at end of file +(cd "${build_dir}/java-runtime" && zip -9rDy${quiet:+q} "${dist_dir}/jdk-runtime.zip" .)
diff --git a/build-openjdk-darwin.sh b/build-openjdk-darwin.sh index b6e383c..0d0095a 100755 --- a/build-openjdk-darwin.sh +++ b/build-openjdk-darwin.sh
@@ -2,11 +2,6 @@ source $(dirname $0)/build-openjdk-common.sh -sdk_version=$(xcrun --show-sdk-version) -if [ "${sdk_version}" != "10.9" -a "${sdk_version}" != "10.10" ]; then - echo "Xcode sdk version 10.9 or 10.10 is required" - exit 1 -fi clang_dir=${TOP}/prebuilts/clang/host/darwin-x86/clang-r399163b freetype=freetype-2.8
diff --git a/build-openjdk11-darwin.sh b/build-openjdk11-darwin.sh index 387721e..23d99b6 100755 --- a/build-openjdk11-darwin.sh +++ b/build-openjdk11-darwin.sh
@@ -59,10 +59,6 @@ shift $(($OPTIND-1)) (($#==1)) || usage -declare -r sdk_version=$(xcrun --show-sdk-version) -[[ "${sdk_version}" == "10.9" || "${sdk_version}" == "10.10" ]] || \ - { echo "Xcode sdk version 10.9 or 10.10 is required"; exit 1; } - declare -r out_path=$(make_target_dir "$1") declare -r sysroot=$(xcrun --show-sdk-path) declare -r build_dir="$out_path/build"