From 757c90e53c64ec8605f8471ae1b7672de23da61e Mon Sep 17 00:00:00 2001 From: TheBeastOfCaerbannog Date: Tue, 21 Mar 2017 12:02:26 +0300 Subject: build: don't create directory for NDK toolchain Let make-standalone-toolchain.sh create directory. PR-URL: https://github.com/nodejs/node/pull/11916 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- android-configure | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'android-configure') diff --git a/android-configure b/android-configure index 1dc238ebd0..59f0a40c1a 100755 --- a/android-configure +++ b/android-configure @@ -38,13 +38,26 @@ case $ARCH in ;; esac +NDK_PATH=$1 +function make_toolchain { + $NDK_PATH/build/tools/make-standalone-toolchain.sh \ + --toolchain=$TOOLCHAIN_NAME-$CC_VER \ + --arch=$ARCH \ + --install-dir=$TOOLCHAIN \ + --platform=android-21 +} + export TOOLCHAIN=$PWD/android-toolchain -mkdir -p $TOOLCHAIN -$1/build/tools/make-standalone-toolchain.sh \ - --toolchain=$TOOLCHAIN_NAME-$CC_VER \ - --arch=$ARCH \ - --install-dir=$TOOLCHAIN \ - --platform=android-21 +if [ -d "$TOOLCHAIN" ]; then + read -r -p "NDK toolchain already exists. Replace it? [y/N]" response + case "$response" in + [Yy]) + rm -rf "$TOOLCHAIN" + make_toolchain + esac +else + make_toolchain +fi export PATH=$TOOLCHAIN/bin:$PATH export AR=$TOOLCHAIN/bin/$SUFFIX-ar export CC=$TOOLCHAIN/bin/$SUFFIX-gcc -- cgit v1.2.3