From 1d63f4e7074dbc8237656159b5da9e7533b1258d Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 30 May 2017 22:26:21 -0400
Subject: [PATCH 1/3] Fix configure glog script

---
 scripts/ios-configure-glog.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index 92b7f31d154c5a..de9eeea5614b9b 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 set -e
 
-# Only set when not running in an Xcode context
-if [ -z "$ACTION" ] || [ -z "$BUILD_DIR" ]; then
-  export CC="$(xcrun -find -sdk iphoneos cc) -arch armv7 -isysroot $(xcrun -sdk iphoneos --show-sdk-path)"
-  export CXX="$CC"
-fi
+export CC="$(xcrun -find -sdk iphoneos cc) -arch armv7 -isysroot $(xcrun -sdk iphoneos --show-sdk-path)"
+export CXX="$CC"
 
 ./configure --host arm-apple-darwin
 

From ed828ca14908a90577976dcf14ce1cdffd395d4a Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 20 Jun 2017 00:07:44 -0400
Subject: [PATCH 2/3] Use env to set CC

---
 scripts/ios-configure-glog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index de9eeea5614b9b..3c05d54df84526 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-export CC="$(xcrun -find -sdk iphoneos cc) -arch armv7 -isysroot $(xcrun -sdk iphoneos --show-sdk-path)"
+export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
 export CXX="$CC"
 
 ./configure --host arm-apple-darwin

From 5ad13569ab599a958bb14a4b4470a01d2b58d404 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 20 Jun 2017 14:22:48 -0400
Subject: [PATCH 3/3] Add default values

---
 scripts/ios-configure-glog.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index 3c05d54df84526..5c71d578129bb2 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+PLATFORM_NAME="${PLATFORM_NAME:-iphoneos}"
+CURRENT_ARCH="${CURRENT_ARCH:-armv7}"
+
 export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
 export CXX="$CC"