From b29ebfe91c643b4bab1f24c2b55bf0a5a83cb825 Mon Sep 17 00:00:00 2001
From: Johann <johannkoenig@google.com>
Date: Thu, 16 Jun 2016 16:35:45 -0700
Subject: Remove ios-version.sh

The logic can be incorporated into configure.sh

Removes a dependency on ios-version.sh which was not part of DIST-SRCS
and removes a warning from 'make dist' sub builds:

../src/build/make/configure.sh: line 787:
../src/build/make/ios-version.sh: No such file or directory

Change-Id: Ic38314708eb278dd9d2a9769a670da32f6126637
---
 build/make/configure.sh   |  5 +++--
 build/make/ios-version.sh | 17 -----------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100755 build/make/ios-version.sh

(limited to 'build/make')

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 33f658e66..42616655a 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -751,13 +751,14 @@ process_common_toolchain() {
   enabled shared && soft_enable pic
 
   # Minimum iOS version for all target platforms (darwin and iphonesimulator).
+  # Shared library framework builds are only possible on iOS 8 and later.
   if enabled shared; then
     IOS_VERSION_OPTIONS="--enable-shared"
+    IOS_VERSION_MIN="8.0"
   else
     IOS_VERSION_OPTIONS=""
+    IOS_VERSION_MIN="6.0"
   fi
-  IOS_VERSION_MIN=$("${source_path}/build/make/ios-version.sh" \
-    ${IOS_VERSION_OPTIONS})
 
   # Handle darwin variants. Newer SDKs allow targeting older
   # platforms, so use the newest one available.
diff --git a/build/make/ios-version.sh b/build/make/ios-version.sh
deleted file mode 100755
index 7252eb4d6..000000000
--- a/build/make/ios-version.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-##
-##  Copyright (c) 2016 The WebM project authors. All Rights Reserved.
-##
-##  Use of this source code is governed by a BSD-style license
-##  that can be found in the LICENSE file in the root of the source
-##  tree. An additional intellectual property rights grant can be found
-##  in the file PATENTS.  All contributing project authors may
-##  be found in the AUTHORS file in the root of the source tree.
-##
-
-if [ "$1" = "--enable-shared" ]; then
-  # Shared library framework builds are only possible on iOS 8 and later.
-  echo "8.0"
-else
-  echo "6.0"
-fi
-- 
cgit v1.2.3