cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make_standalone_toolchain.py requires Python2, sigh

Browse Source
This commit is contained in:
Frank Denis 2017-03-06 10:08:01 +01:00
parent 3e56ce235d
commit 4f2881a528
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist-build/android-build.sh
View File

@ -25,6 +25,7 @@ if [ "x$TARGET_ARCH" = 'x' ] || [ "x$ARCH" = 'x' ] || [ "x$HOST_COMPILER" = 'x'
exit 1 exit 1
fi fi
export PYTHON2=$(python2 --version > /dev/null 2>&1 && echo python2 || echo python)
export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py" export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py"
export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}" export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}"
@ -38,7 +39,7 @@ echo "Building for platform [${NDK_PLATFORM}], retaining compatibility with plat
echo echo
env - PATH="$PATH" \ env - PATH="$PATH" \
$MAKE_TOOLCHAIN --force --api="$NDK_API_VERSION_COMPAT" \ "$PYTHON2" "$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
--unified-headers --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 --unified-headers --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
./configure \ ./configure \
@ -54,7 +55,7 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
echo "Configuring again for platform [${NDK_PLATFORM}]" echo "Configuring again for platform [${NDK_PLATFORM}]"
echo echo
env - PATH="$PATH" \ env - PATH="$PATH" \
$MAKE_TOOLCHAIN --force --api="$NDK_API_VERSION" \ "$PYTHON2" "$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION" \
--unified-headers --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 --unified-headers --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
./configure \ ./configure \