[Android] compile-libvlc: contribs: Do not rely on PATH being set

Hugo Beauzée-Luyssen git at videolan.org
Fri Apr 21 15:16:27 CEST 2017


vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Apr 20 16:23:45 2017 +0200| [77e8f22af5bd426d4ec7589ef2267499f26c2a75] | committer: Hugo Beauzée-Luyssen

compile-libvlc: contribs: Do not rely on PATH being set

This allows make to be used as always when compiling contribs

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

 compile-libvlc.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index c892ca0..907f9b4 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -513,6 +513,11 @@ checkfail "contribs: bootstrap failed"
 echo "EXTRA_CFLAGS=${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_CXXFLAGS=${EXTRA_CXXFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS=${EXTRA_LDFLAGS}" >> config.mak
+echo "CC=${NDK_TOOLCHAIN_PATH}/clang" >> config.mak
+echo "CXX=${NDK_TOOLCHAIN_PATH}/clang++" >> config.mak
+echo "AR=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ar" >> config.mak
+echo "RANLIB=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ranlib" >> config.mak
+echo "LD=${NDK_TOOLCHAIN_PATH}/${TARGET_TUPLE}-ld" >> config.mak
 
 make $MAKEFLAGS fetch
 checkfail "contribs: make fetch failed"
@@ -520,7 +525,6 @@ checkfail "contribs: make fetch failed"
 # gettext
 which autopoint >/dev/null || make $MAKEFLAGS .gettext
 #export the PATH
-export PATH="$PATH:$PWD/../$TARGET_TUPLE/bin"
 # Make
 make $MAKEFLAGS
 checkfail "contribs: make failed"



More information about the Android mailing list