vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Mar 20
20:09:17 2012 +0200| [e83bc5b906970b234231906a41afdd5f5bee8b68] | committer:
Rémi Denis-Courmont
Revert "contrib: don't stip the arch from {HOST}"
This reverts commit fbfaa42af10a1dc78aa4e9cf2c21e26f19519ab1.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e83bc5b906970b234231906a41afdd5f5bee8b68
---
contrib/bootstrap | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index de77a34..9266fd6 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -188,7 +188,8 @@ test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
#
# Checks
#
-case "${HOST}" in
+OS="${HOST#*-}" # strip architecture
+case "${OS}" in
arm-apple-darwin*)
check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD"
@@ -204,7 +205,7 @@ case "${HOST}" in
*bsd*)
add_make_enabled "HAVE_BSD"
;;
- *linux-androideabi)
+ linux-androideabi)
check_android_sdk
add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
add_make "PATH =
${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
