X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftools%2Fclang%2Fscripts%2Fupdate.sh;h=598d81550fff6d7a4b8a9dc682a125113cff4d3e;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=2beb4e39b28b32c1cfb3f6d1bcfa1582cc82d516;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/tools/clang/scripts/update.sh b/src/tools/clang/scripts/update.sh index 2beb4e3..598d815 100755 --- a/src/tools/clang/scripts/update.sh +++ b/src/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=209387 +CLANG_REVISION=214024 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" @@ -137,12 +137,6 @@ while [[ $# > 0 ]]; do shift done -# Remove clang on bots where it was autoinstalled in r262025. -if [[ -f "${LLVM_BUILD_DIR}/autoinstall_stamp" ]]; then - echo Removing autoinstalled clang and clobbering - rm -rf "${LLVM_BUILD_DIR}" -fi - if [[ -n "$if_needed" ]]; then if [[ "${OS}" == "Darwin" ]]; then # clang is used on Mac. @@ -154,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