[Android] use the Msys make.exe and awk.exe don' t work instead of the broken toolchain ones

Steve Lhomme git at videolan.org
Fri Oct 21 15:24:50 CEST 2016


vlc-android | branch: master | Steve Lhomme <robux4 at videolabs.io> | Tue Oct 18 12:46:19 2016 +0200| [bff4dde624f6bd5bbfb4137fdad950df31ba889c] | committer: Thomas Guillem

use the Msys make.exe and awk.exe don't work instead of the broken toolchain ones

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> https://code.videolan.org/videolan/vlc-android/commit/bff4dde624f6bd5bbfb4137fdad950df31ba889c
---

 compile-libvlc.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 8241031..7bd6450 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -325,6 +325,10 @@ SRC_DIR=$PWD
 CROSS_TOOLS=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-
 
 export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
+if [ ! -z "$MSYSTEM_PREFIX" ] ; then
+    # The make.exe and awk.exe from the toolchain don't work in msys
+    export PATH=$MSYSTEM_PREFIX/bin:/usr/bin:${NDK_TOOLCHAIN_PATH}:${PATH}
+fi
 
 ON_WINDOWS=0
 if [ ! -z "$MSYSTEM_PREFIX" ] ; then



More information about the Android mailing list