Skip to content

V
vlc-2-2
Commit e83bc5b9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Revert "contrib: don't stip the arch from {HOST}" 

This reverts commit fbfaa42a.
parent 6a77e0bd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
contrib/bootstrap
View file @ e83bc5b9
...@@ -188,7 +188,8 @@ test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL" ...@@ -188,7 +188,8 @@ test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
# #
# Checks # Checks
# #
case "${HOST}" in OS="${HOST#*-}" # strip architecture
case "${OS}" in
arm-apple-darwin*) arm-apple-darwin*)
check_ios_sdk check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
...@@ -204,7 +205,7 @@ case "${HOST}" in ...@@ -204,7 +205,7 @@ case "${HOST}" in
*bsd*) *bsd*)
add_make_enabled "HAVE_BSD" add_make_enabled "HAVE_BSD"
;; ;;
*linux-androideabi) linux-androideabi)
check_android_sdk check_android_sdk
add_make_enabled "HAVE_LINUX" "HAVE_ANDROID" add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}" add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment