diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 22:01:23 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 22:01:23 +0000 |
| commit | 9e7cf2333938119f508fe46ca70eb11da016dbad (patch) | |
| tree | a2a2f8873db6219321a359d008e3c8c3c2a6c08b /tools/clang | |
| parent | 7bfc153ff70b4c1927c144c73da38be5d153bad3 (diff) | |
| download | chromium_src-9e7cf2333938119f508fe46ca70eb11da016dbad.zip chromium_src-9e7cf2333938119f508fe46ca70eb11da016dbad.tar.gz chromium_src-9e7cf2333938119f508fe46ca70eb11da016dbad.tar.bz2 | |
clang updater: Prefer curl over wget on linux if installed.
BUG=97288
TEST=none
Review URL: http://codereview.chromium.org/8015020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rwxr-xr-x | tools/clang/scripts/update.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index aaa01b7..9fb292a 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -118,13 +118,20 @@ if [ -z "$force_local_build" ]; then CDS_FILE="clang-${CLANG_REVISION}.tgz" CDS_OUT_DIR=$(mktemp -d -t clang_download.XXXXXX) CDS_OUTPUT="${CDS_OUT_DIR}/${CDS_FILE}" - echo Trying to download prebuilt clang if [ "${OS}" = "Linux" ]; then - wget "${CDS_URL}/Linux_x64/${CDS_FILE}" -O "${CDS_OUTPUT}" || \ - rm -rf "${CDS_OUT_DIR}" + CDS_FULL_URL="${CDS_URL}/Linux_x64/${CDS_FILE}" elif [ "${OS}" = "Darwin" ]; then - curl -L --fail "${CDS_URL}/Mac/${CDS_FILE}" -o "${CDS_OUTPUT}" || \ + CDS_FULL_URL="${CDS_URL}/Mac/${CDS_FILE}" + fi + echo Trying to download prebuilt clang + if which -s curl; then + curl -L --fail "${CDS_FULL_URL}" -o "${CDS_OUTPUT}" || \ rm -rf "${CDS_OUT_DIR}" + elif which -s wget; then + wget "${CDS_FULL_URL}" -O "${CDS_OUTPUT}" || rm -rf "${CDS_OUT_DIR}" + else + echo "Neither curl nor wget found. Please install one of these." + exit 1 fi if [ -f "${CDS_OUTPUT}" ]; then rm -rf "${LLVM_BUILD_DIR}/Release+Asserts" |