diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-05-14 16:43:03 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-05-14 16:43:03 +0200 |
| commit | 609fa1b1b08de6aa02a5b5e1a361db97cf3d2f43 (patch) | |
| tree | bed83bd09090363959e121f903f1adc79e3d1c1f /build/tools | |
| parent | 149702372fd1779cc6b23e9bc3eb47b6a47f1664 (diff) | |
| download | ndk-609fa1b1b08de6aa02a5b5e1a361db97cf3d2f43.tar.gz | |
Fix the build-toolchain.sh script which doesn't work due to the new download location of the NDK sources
and a small typo when using wget. Also make --force-download actually work.
Diffstat (limited to 'build/tools')
| -rwxr-xr-x | build/tools/build-toolchain.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build/tools/build-toolchain.sh b/build/tools/build-toolchain.sh index e1047bd92..75de8f973 100755 --- a/build/tools/build-toolchain.sh +++ b/build/tools/build-toolchain.sh @@ -154,13 +154,6 @@ ANDROID_GDBSERVER_OUT=$OUT/gdbserver ANDROID_GDBSERVER_BUILD=$ANDROID_GDBSERVER_OUT/build ANDROID_GDBSERVER_DEST=$ANDROID_SYSROOT/usr/bin -# checks, we need more checks.. -mkdir -p $PACKAGE_OUT -if [ $? != 0 ] ; then - echo "Can't create download/archive directory for toolchain tarballs" - exit 2 -fi - # Let's check that we have a working md5sum here A_MD5=`echo "A" | md5sum | cut -d' ' -f1` if [ "$A_MD5" != "bf072e9119077b4e76437a93986787ef" ] ; then @@ -182,7 +175,7 @@ download_file () echo $1 | grep -q -e "^\(http\|https\):.*" if [ $? = 0 ] ; then if [ -n "$WGET" ] ; then - $WGET -o $2 $1 + $WGET -O $2 $1 elif [ -n "$CURL" ] ; then $CURL -o $2 $1 else @@ -352,7 +345,7 @@ unpack_package () } if [ $OPTION_FORCE_DOWNLOAD ] ; then - rm -rf $ANDROID_TOOLCHAIN_SRC + rm -rf $PACKAGE_OUT $ANDROID_TOOLCHAIN_SRC timestamp_force toolchain unpack timestamp_force toolchain verify fi @@ -363,6 +356,13 @@ if [ $OPTION_FORCE_BUILD ] ; then timestamp_clear gdbserver fi +# checks, we need more checks.. +mkdir -p $PACKAGE_OUT +if [ $? != 0 ] ; then + echo "Can't create download/archive directory for toolchain tarballs" + exit 2 +fi + download_package toolchain unpack_package toolchain $ANDROID_TOOLCHAIN_SRC |