diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 03:55:24 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 03:55:24 +0000 |
| commit | d8ca2477d145e0dd1108a6150d920a0526d74bdc (patch) | |
| tree | 1f53867b7b04c2725647a66960f7fa24a29cf178 /tools/clang | |
| parent | bdd944188cb9a0b3615352251e371b8a0ed45915 (diff) | |
| download | chromium_src-d8ca2477d145e0dd1108a6150d920a0526d74bdc.zip chromium_src-d8ca2477d145e0dd1108a6150d920a0526d74bdc.tar.gz chromium_src-d8ca2477d145e0dd1108a6150d920a0526d74bdc.tar.bz2 | |
Turn on clang by default on linux, 3rd try.
This is mostly to collect performance and size data for now, and to find out
if more bots need work. Unless things look really good, I'm going to revert
this by thursday morning (PDT).
BUG=360311
TBR=ajwong@chromium.org
Review URL: https://codereview.chromium.org/379413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rwxr-xr-x | tools/clang/scripts/update.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 529873c..e86c288 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -137,13 +137,6 @@ while [[ $# > 0 ]]; do shift done -# Remove clang on bots where it was autoinstalled in r281914. -if [[ -f "${LLVM_BUILD_DIR}/autoinstall_stamp" ]]; then - echo Removing autoinstalled clang and clobbering - rm -rf "${LLVM_BUILD_DIR}" - rm -rf "${THIS_DIR}/../../../out" -fi - if [[ -n "$if_needed" ]]; then if [[ "${OS}" == "Darwin" ]]; then # clang is used on Mac. @@ -155,6 +148,12 @@ if [[ -n "$if_needed" ]]; then # clang previously downloaded, remove third_party/llvm-build to prevent # updating. true + elif [[ "${OS}" == "Linux" ]]; then + # Temporarily use clang on linux. Leave a stamp file behind, so that + # this script can remove clang again on machines where it was autoinstalled. + mkdir -p "${LLVM_BUILD_DIR}" + touch "${LLVM_BUILD_DIR}/autoinstall_stamp" + true else # clang wasn't needed, not doing anything. exit 0 |