diff options
| author | Johann Koenig <johannkoenig@google.com> | 2021-11-17 03:35:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-17 03:35:50 +0000 |
| commit | 7a37d69cae9c8ed0695e9b065162082f33ebedf1 (patch) | |
| tree | 408896a9a1415020737d07533ba8bfe097648d5b | |
| parent | 4569745514ddbe49fe8c107f3b32286a6388b216 (diff) | |
| parent | c59de7bc914d40305c1a7b066b9965d809d81533 (diff) | |
| download | libvpx-7a37d69cae9c8ed0695e9b065162082f33ebedf1.tar libvpx-7a37d69cae9c8ed0695e9b065162082f33ebedf1.tar.gz libvpx-7a37d69cae9c8ed0695e9b065162082f33ebedf1.tar.bz2 libvpx-7a37d69cae9c8ed0695e9b065162082f33ebedf1.zip | |
Merge "MacOS 12 is darwin21" into main
| -rw-r--r-- | build/make/configure.sh | 8 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 81d30a16c..b24e79a0d 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -774,7 +774,7 @@ process_common_toolchain() { tgt_isa=x86_64 tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'` ;; - *darwin20*) + *darwin2[0-1]*) tgt_isa=`uname -m` tgt_os=`echo $gcctarget | sed 's/.*\(darwin2[0-9]\).*/\1/'` ;; @@ -918,9 +918,9 @@ process_common_toolchain() { add_cflags "-mmacosx-version-min=10.15" add_ldflags "-mmacosx-version-min=10.15" ;; - *-darwin20-*) - add_cflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}" - add_ldflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}" + *-darwin2[0-1]-*) + add_cflags "-arch ${toolchain%%-*}" + add_ldflags "-arch ${toolchain%%-*}" ;; *-iphonesimulator-*) add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" @@ -100,6 +100,7 @@ EOF all_platforms="${all_platforms} arm64-android-gcc" 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-linux-gcc" all_platforms="${all_platforms} arm64-win64-gcc" all_platforms="${all_platforms} arm64-win64-vs15" @@ -152,6 +153,7 @@ all_platforms="${all_platforms} x86_64-darwin17-gcc" all_platforms="${all_platforms} x86_64-darwin18-gcc" 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-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" |