From d69b1c752587149269e9b0d1e7563bc5eb66be6a Mon Sep 17 00:00:00 2001
From: kaipi <kaipi@google.com>
Date: Mon, 16 Jul 2018 07:27:29 -0700
Subject: Remove fallback for SDKROOT as all users of this script are setting
 the environment properly.

PiperOrigin-RevId: 204738902
---
 tools/objc/xcrunwrapper.sh | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/tools/objc/xcrunwrapper.sh b/tools/objc/xcrunwrapper.sh
index e005895881..42d841b893 100755
--- a/tools/objc/xcrunwrapper.sh
+++ b/tools/objc/xcrunwrapper.sh
@@ -33,29 +33,11 @@ if [[ -z "${WRAPPER_DEVDIR}" ]] ; then
   WRAPPER_DEVDIR="$(xcode-select -p)"
 fi
 
-# TODO(blaze-team): Remove this once all build environments are setting SDKROOT
-# for us.
-WRAPPER_SDKROOT="${SDKROOT:-}"
-if [[ -z "${WRAPPER_SDKROOT:-}" ]] ; then
-  WRAPPER_SDK=iphonesimulator
-  for ARG in "$@" ; do
-    case "${ARG}" in
-      armv6|armv7|armv7s|arm64)
-        WRAPPER_SDK=iphoneos
-        ;;
-      i386|x86_64)
-        WRAPPER_SDK=iphonesimulator
-        ;;
-    esac
-  done
-  WRAPPER_SDKROOT="$(/usr/bin/xcrun --show-sdk-path --sdk ${WRAPPER_SDK})"
-fi
-
 # Subsitute toolkit path placeholders.
 UPDATEDARGS=()
 for ARG in "$@" ; do
   ARG="${ARG//__BAZEL_XCODE_DEVELOPER_DIR__/${WRAPPER_DEVDIR}}"
-  ARG="${ARG//__BAZEL_XCODE_SDKROOT__/${WRAPPER_SDKROOT}}"
+  ARG="${ARG//__BAZEL_XCODE_SDKROOT__/${SDKROOT}}"
   UPDATEDARGS+=("${ARG}")
 done
 
-- 
cgit v1.2.3