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

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

Issue 12255003: Fix a syntax error which resulted in update.sh always using the old Clang. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | « no previous file | 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
===================================================================
--- tools/clang/scripts/update.sh (revision 182174)
+++ tools/clang/scripts/update.sh (working copy)
@@ -36,7 +36,9 @@
run_tests=
bootstrap=
with_android=yes
-is_asan_mac_builder=
+# Temporary workaround for http://crbug.com/170629: use older Clang for ASan
+# Mac builders.
+is_asan_mac_builder_hackfix=
with_tools_extra=
if [[ "${OS}" = "Darwin" ]]; then
with_android=
@@ -59,8 +61,10 @@
--without-android)
with_android=
;;
- --is-asan-mac-builder)
- is_asan_mac_builder=yes
+ # Temporary workaround for http://crbug.com/170629 - use older Clang for
+ # ASan Mac builders.
+ --is-asan-mac-builder-hackfix)
+ is_asan_mac_builder_hackfix=yes
;;
--with-tools-extra)
with_tools_extra=yes
@@ -72,7 +76,8 @@
echo "--mac-only: Do initial download only on Mac systems."
echo "--run-tests: Run tests after building. Only for local builds."
echo "--without-android: Don't build ASan Android runtime library."
- echo "--is-asan-mac-builder: Use older Clang to build ASan on Mac."
+ echo "--is-asan-mac-builder-hackfix: Use older Clang" \
+ "to build ASan on Mac."
echo "--with-tools-extra: Also build the clang-tools-extra repository."
exit 1
;;
@@ -102,7 +107,7 @@
}
# Use older Clang for ASan Mac builds. See http://crbug.com/170629.
-if [[ -n is_asan_mac_builder ]] || on_asan_mac_host; then
+if [[ -n "${is_asan_mac_builder_hackfix}" ]] || on_asan_mac_host; then
CLANG_REVISION=${CLANG_ASAN_MAC_REVISION}
fi
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698