Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1282)

Unified Diff: tools/clang/scripts/update.sh

Issue 1375213007: Clang toolchain on Linux: compress with XZ, include LLVM Gold plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« tools/clang/scripts/package.py ('K') | « tools/clang/scripts/package.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/clang/scripts/update.sh
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 36b6e81eae7f3c4457b394dc5ab81b43c96b6e1d..8098e2e2c05e46eda17458a5a943afa09eed3a01 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -245,13 +245,14 @@ rm -f "${STAMP_FILE}"
if [[ -z "$force_local_build" ]]; then
# Check if there's a prebuilt binary and if so just fetch that. That's faster,
# and goma relies on having matching binary hashes on client and server too.
- CDS_FILE="clang-${PACKAGE_VERSION}.tgz"
+ CDS_FILE="clang-${PACKAGE_VERSION}"
CDS_OUT_DIR=$(mktemp -d -t clang_download.XXXXXX)
- CDS_OUTPUT="${CDS_OUT_DIR}/${CDS_FILE}"
+ CDS_OUTPUT="${CDS_OUT_DIR}/${CDS_FILE}.tgz"
if [ "${OS}" = "Linux" ]; then
- CDS_FULL_URL="${CDS_URL}/Linux_x64/${CDS_FILE}"
+ CDS_OUTPUT="${CDS_OUT_DIR}/${CDS_FILE}.tar.xz"
+ CDS_FULL_URL="${CDS_URL}/Linux_x64/${CDS_FILE}.tar.xz"
elif [ "${OS}" = "Darwin" ]; then
- CDS_FULL_URL="${CDS_URL}/Mac/${CDS_FILE}"
+ CDS_FULL_URL="${CDS_URL}/Mac/${CDS_FILE}.tgz"
fi
echo Trying to download prebuilt clang
if which curl > /dev/null; then
@@ -266,7 +267,11 @@ if [[ -z "$force_local_build" ]]; then
if [ -f "${CDS_OUTPUT}" ]; then
rm -rf "${LLVM_BUILD_DIR}"
mkdir -p "${LLVM_BUILD_DIR}"
- tar -xzf "${CDS_OUTPUT}" -C "${LLVM_BUILD_DIR}"
+ if [ "${OS}" = "Linux"]; then
+ unxz < "${CDS_OUTPUT}" | tar -x -C "${LLVM_BUILD_DIR}"
hans 2015/10/05 20:53:57 Maybe just use tar's -J option?
+ else
+ tar -xzf "${CDS_OUTPUT}" -C "${LLVM_BUILD_DIR}"
+ fi
echo clang "${PACKAGE_VERSION}" unpacked
echo "${PACKAGE_VERSION}" > "${STAMP_FILE}"
rm -rf "${CDS_OUT_DIR}"
« tools/clang/scripts/package.py ('K') | « tools/clang/scripts/package.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698