1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: don't create directory for NDK toolchain

Browse Source 
Let make-standalone-toolchain.sh create directory.

PR-URL: https://github.com/nodejs/node/pull/11916
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
TheBeastOfCaerbannog 2017-03-21 12:02:26 +03:00 committed by James M Snell
parent eed87b1637
commit 757c90e53c
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
android-configure
View File

@ -38,13 +38,26 @@ case $ARCH in
;; ;;
esac 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 export TOOLCHAIN=$PWD/android-toolchain
mkdir -p $TOOLCHAIN if [ -d "$TOOLCHAIN" ]; then
$1/build/tools/make-standalone-toolchain.sh \ read -r -p "NDK toolchain already exists. Replace it? [y/N]" response
--toolchain=$TOOLCHAIN_NAME-$CC_VER \ case "$response" in
--arch=$ARCH \ [Yy])
--install-dir=$TOOLCHAIN \ rm -rf "$TOOLCHAIN"
--platform=android-21 make_toolchain
esac
else
make_toolchain
fi
export PATH=$TOOLCHAIN/bin:$PATH export PATH=$TOOLCHAIN/bin:$PATH
export AR=$TOOLCHAIN/bin/$SUFFIX-ar export AR=$TOOLCHAIN/bin/$SUFFIX-ar
export CC=$TOOLCHAIN/bin/$SUFFIX-gcc export CC=$TOOLCHAIN/bin/$SUFFIX-gcc