commit ddca3dec36a0bbb996ef702b7d94cc8fb3b35827
author Johann Koenig <johannkoenig@google.com> Thu Oct 27 08:38:48 2022
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 27 08:38:48 2022
tree e627b67a962b04f9ecce91e3dcbfb23277b6ef5e
parent 17fbc6cfa1e39d4502574db5dc4212d49fa91d7b
parent ebf22e2e8db9e863a2cbc24081381e24fe306882

Merge "MacOS 13 is darwin22" into main

build/make/configure.sh

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 581042e..e9b7fa9 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -791,7 +791,7 @@
         tgt_isa=x86_64
         tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`
         ;;
-      *darwin2[0-1]*)
+      *darwin2[0-2]*)
         tgt_isa=`uname -m`
         tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'`
         ;;
@@ -940,7 +940,7 @@
       add_cflags  "-mmacosx-version-min=10.15"
       add_ldflags "-mmacosx-version-min=10.15"
       ;;
-    *-darwin2[0-1]-*)
+    *-darwin2[0-2]-*)
       add_cflags  "-arch ${toolchain%%-*}"
       add_ldflags "-arch ${toolchain%%-*}"
       ;;

configure

diff --git a/configure b/configure
index 1b850b5..bf92e1a 100755
--- a/configure
+++ b/configure
@@ -101,6 +101,7 @@
 all_platforms="${all_platforms} arm64-darwin-gcc"
 all_platforms="${all_platforms} arm64-darwin20-gcc"
 all_platforms="${all_platforms} arm64-darwin21-gcc"
+all_platforms="${all_platforms} arm64-darwin22-gcc"
 all_platforms="${all_platforms} arm64-linux-gcc"
 all_platforms="${all_platforms} arm64-win64-gcc"
 all_platforms="${all_platforms} arm64-win64-vs15"
@@ -157,6 +158,7 @@
 all_platforms="${all_platforms} x86_64-darwin19-gcc"
 all_platforms="${all_platforms} x86_64-darwin20-gcc"
 all_platforms="${all_platforms} x86_64-darwin21-gcc"
+all_platforms="${all_platforms} x86_64-darwin22-gcc"
 all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
 all_platforms="${all_platforms} x86_64-linux-gcc"
 all_platforms="${all_platforms} x86_64-linux-icc"