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

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

Issue 227133002: Revert "Turn on clang by default on linux." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clob Created 6 years, 8 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
« no previous file with comments | « build/common.gypi ('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 85a33d6c51d9f531d8daf7fdf84a9e20856f8dbe..a40224c85989d5ee4698619eed58adc48202ce90 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -132,6 +132,13 @@ 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}"
+ rm -rf "${THIS_DIR}/../../../out"
+fi
+
if [[ -n "$if_needed" ]]; then
if [[ "${OS}" == "Darwin" ]]; then
# clang is used on Mac.
@@ -143,12 +150,6 @@ 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
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698