From 5ed1801f1049a91c9e6ecb40cc3003532c8cd565 Mon Sep 17 00:00:00 2001
From: Johann <johannkoenig@google.com>
Date: Wed, 23 Oct 2019 13:50:31 -0400
Subject: [PATCH] add darwin18 target

Fix autodetection on MacOS 10.14. Without this it defaults
to generic-gnu

Change-Id: I19cd4a9f2fb106dff16ab5e38821a5f374add59c
---
 README                  | 1 +
 build/make/configure.sh | 8 ++++++++
 configure               | 1 +
 3 files changed, 10 insertions(+)

diff --git a/README b/README
index a1000e085..eae97831f 100644
--- a/README
+++ b/README
@@ -110,6 +110,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
     x86_64-darwin15-gcc
     x86_64-darwin16-gcc
     x86_64-darwin17-gcc
+    x86_64-darwin18-gcc
     x86_64-iphonesimulator-gcc
     x86_64-linux-gcc
     x86_64-linux-icc
diff --git a/build/make/configure.sh b/build/make/configure.sh
index a4f14c04e..db22b04da 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -799,6 +799,10 @@ process_common_toolchain() {
         tgt_isa=x86_64
         tgt_os=darwin17
         ;;
+      *darwin18*)
+        tgt_isa=x86_64
+        tgt_os=darwin18
+        ;;
       x86_64*mingw32*)
         tgt_os=win64
         ;;
@@ -931,6 +935,10 @@ process_common_toolchain() {
       add_cflags  "-mmacosx-version-min=10.13"
       add_ldflags "-mmacosx-version-min=10.13"
       ;;
+    *-darwin18-*)
+      add_cflags  "-mmacosx-version-min=10.14"
+      add_ldflags "-mmacosx-version-min=10.14"
+      ;;
     *-iphonesimulator-*)
       add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
       add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
diff --git a/configure b/configure
index d29e00ad8..4f5816134 100755
--- a/configure
+++ b/configure
@@ -147,6 +147,7 @@ all_platforms="${all_platforms} x86_64-darwin14-gcc"
 all_platforms="${all_platforms} x86_64-darwin15-gcc"
 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-iphonesimulator-gcc"
 all_platforms="${all_platforms} x86_64-linux-gcc"
 all_platforms="${all_platforms} x86_64-linux-icc"
-- 
2.40.0