diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 00:11:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 00:11:09 +0000 |
| commit | dc9339d9b99652f8691fd8977846a181460c5297 (patch) | |
| tree | a9c6fdfa0a2b8ff48914cb1a7b7fe6e40a29a6c6 /tools/clang | |
| parent | 86b36e67600b2bde0487725a1eb9b7934a0053ee (diff) | |
| download | chromium_src-dc9339d9b99652f8691fd8977846a181460c5297.zip chromium_src-dc9339d9b99652f8691fd8977846a181460c5297.tar.gz chromium_src-dc9339d9b99652f8691fd8977846a181460c5297.tar.bz2 | |
roll clang 169803:170392
Also let the update script clobber nacl untar stamp files, so that no
clobber builds are needed after clang rolls.
BUG=159793
TBR=hans
Review URL: https://codereview.chromium.org/11644047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rwxr-xr-x | tools/clang/scripts/update.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 5c37bff..2700001 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -8,7 +8,7 @@ # Do NOT CHANGE this if you don't know what you're doing -- see # https://code.google.com/p/chromium/wiki/UpdatingClang # Reverting problematic clang rolls is safe, though. -CLANG_REVISION=169803 +CLANG_REVISION=170392 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" @@ -167,6 +167,16 @@ for CONFIG in Debug Release; do fi done +# Clobber NaCl toolchain stamp files, see http://crbug.com/159793 +if [[ -d "${MAKE_DIR}" ]]; then + find "${MAKE_DIR}" -name 'stamp.untar' -exec rm {} + +fi +if [[ "${OS}" = "Darwin" ]]; then + if [[ -d "${XCODEBUILD_DIR}" ]]; then + find "${XCODEBUILD_DIR}" -name 'stamp.untar' -exec rm {} + + fi +fi + 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. |