[vlc-commits] build.sh: Move MINIMAL_OSX_VERSION and ARCH to env.build.sh

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Sep 23 19:14:41 2018 +0200| [0d0cacee6a1c992ab0663764c9efa724253a0bf1] | committer: David Fuhrmann

build.sh: Move MINIMAL_OSX_VERSION and ARCH to env.build.sh

To have a central place for this definition and ARCH.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d0cacee6a1c992ab0663764c9efa724253a0bf1
---

 extras/package/macosx/build.sh     |  3 ---
 extras/package/macosx/env.build.sh | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 852fd0a41d..bb1d116ed4 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -11,9 +11,6 @@ info()
 SCRIPTDIR=$(dirname "$0")
 source "$SCRIPTDIR/env.build.sh" "none"
 
-
-ARCH="x86_64"
-MINIMAL_OSX_VERSION="10.10"
 SDKROOT=$(xcrun --show-sdk-path)
 VLCBUILDDIR=""
 
diff --git a/extras/package/macosx/env.build.sh b/extras/package/macosx/env.build.sh
index eed9b0d998..b40460a178 100755
--- a/extras/package/macosx/env.build.sh
+++ b/extras/package/macosx/env.build.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 
+ARCH="x86_64"
+MINIMAL_OSX_VERSION="10.10"
+
+
 vlcGetTriplet() {
     local OSX_KERNELVERSION=$(uname -r | cut -d. -f1)
     if [ ! -z "$VLC_FORCE_KERNELVERSION" ]; then
         OSX_KERNELVERSION="$VLC_FORCE_KERNELVERSION"
     fi
 
-    local LOCAL_ARCH="x86_64"
-    if [ -n "$ARCH" ]; then
-        LOCAL_ARCH="$ARCH"
-    fi
-
-    echo "$LOCAL_ARCH-apple-darwin$OSX_KERNELVERSION"
+    echo "$ARCH-apple-darwin$OSX_KERNELVERSION"
 }
 
 # Gets VLCs root dir based on location of this file, also follow symlinks
@@ -119,6 +118,7 @@ vlcUnsetContribEnvironment() {
 
 # Parameter handling
 
+
 # First parameter: mode to use this script:
 # vlc (default): auto-setup environment suitable for building vlc itself
 # contrib: auto-setup environment suitable for building vlc contribs
@@ -134,7 +134,7 @@ fi
 if [ "$VLC_ENV_MODE" = "contrib" ]; then
     vlcSetBaseEnvironment
     vlcSetSymbolEnvironment
-    vlcSetContribEnvironment "10.10"
+    vlcSetContribEnvironment "$MINIMAL_OSX_VERSION"
 elif [ "$VLC_ENV_MODE" = "vlc" ]; then
     vlcSetBaseEnvironment
     vlcSetSymbolEnvironment