ref: 39f6b4c960a5849ab272957f48e2856ef375a877
parent: aae27c8f1e4ad38eff29ba9d35a772343c0ce5bf
parent: 3ef630a3571a7b75e563a144bc957720b007c22a
author: Johann Koenig <johannkoenig@google.com>
date: Tue Mar 31 19:41:26 EDT 2020
Merge "auto-detect darwin19"
--- a/README
+++ b/README
@@ -112,6 +112,7 @@
x86_64-darwin16-gcc
x86_64-darwin17-gcc
x86_64-darwin18-gcc
+ x86_64-darwin19-gcc
x86_64-iphonesimulator-gcc
x86_64-linux-gcc
x86_64-linux-icc
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -767,9 +767,9 @@
# detect tgt_os
case "$gcctarget" in
- *darwin1[0-8]*)
+ *darwin1[0-9]*)
tgt_isa=x86_64
- tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-8]\).*/\1/'`
+ tgt_os=`echo $gcctarget | sed 's/.*\(darwin1[0-9]\).*/\1/'`
;;
x86_64*mingw32*)
tgt_os=win64
@@ -906,6 +906,10 @@
*-darwin18-*)
add_cflags "-mmacosx-version-min=10.14"
add_ldflags "-mmacosx-version-min=10.14"
+ ;;
+ *-darwin19-*)
+ add_cflags "-mmacosx-version-min=10.15"
+ add_ldflags "-mmacosx-version-min=10.15"
;;
*-iphonesimulator-*)
add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"--- a/configure
+++ b/configure
@@ -149,6 +149,7 @@
all_platforms="${all_platforms} x86_64-darwin16-gcc" 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-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc"