Skip to content

Commit 3e4ecca

Browse files
diastremskiiMylesBorins
authored andcommitted
build: don't create directory for NDK toolchain
Let make-standalone-toolchain.sh create directory. PR-URL: #11916 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 2f4ad6f commit 3e4ecca

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

android-configure

+19-6
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,26 @@ case $ARCH in
3838
;;
3939
esac
4040

41+
NDK_PATH=$1
42+
function make_toolchain {
43+
$NDK_PATH/build/tools/make-standalone-toolchain.sh \
44+
--toolchain=$TOOLCHAIN_NAME-$CC_VER \
45+
--arch=$ARCH \
46+
--install-dir=$TOOLCHAIN \
47+
--platform=android-21
48+
}
49+
4150
export TOOLCHAIN=$PWD/android-toolchain
42-
mkdir -p $TOOLCHAIN
43-
$1/build/tools/make-standalone-toolchain.sh \
44-
--toolchain=$TOOLCHAIN_NAME-$CC_VER \
45-
--arch=$ARCH \
46-
--install-dir=$TOOLCHAIN \
47-
--platform=android-21
51+
if [ -d "$TOOLCHAIN" ]; then
52+
read -r -p "NDK toolchain already exists. Replace it? [y/N]" response
53+
case "$response" in
54+
[Yy])
55+
rm -rf "$TOOLCHAIN"
56+
make_toolchain
57+
esac
58+
else
59+
make_toolchain
60+
fi
4861
export PATH=$TOOLCHAIN/bin:$PATH
4962
export AR=$TOOLCHAIN/bin/$SUFFIX-ar
5063
export CC=$TOOLCHAIN/bin/$SUFFIX-gcc

0 commit comments

Comments
 (0)