Commit b67648a6 authored by glider@chromium.org's avatar glider@chromium.org

Fix a syntax error which resulted in update.sh always using the old Clang.

Renamed  --is-asan-mac-builder to --is-asan-mac-builder-hackfix per Nico's suggestion.
Added more comments.

BUG=170629, 174873
TBR=thakis
Review URL: https://codereview.chromium.org/12255003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182175 0039d316-1c4b-4281-b951-d872f2087c98
parent ae308113
...@@ -36,7 +36,9 @@ mac_only= ...@@ -36,7 +36,9 @@ mac_only=
run_tests= run_tests=
bootstrap= bootstrap=
with_android=yes 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= with_tools_extra=
if [[ "${OS}" = "Darwin" ]]; then if [[ "${OS}" = "Darwin" ]]; then
with_android= with_android=
...@@ -59,8 +61,10 @@ while [[ $# > 0 ]]; do ...@@ -59,8 +61,10 @@ while [[ $# > 0 ]]; do
--without-android) --without-android)
with_android= with_android=
;; ;;
--is-asan-mac-builder) # Temporary workaround for http://crbug.com/170629 - use older Clang for
is_asan_mac_builder=yes # ASan Mac builders.
--is-asan-mac-builder-hackfix)
is_asan_mac_builder_hackfix=yes
;; ;;
--with-tools-extra) --with-tools-extra)
with_tools_extra=yes with_tools_extra=yes
...@@ -72,7 +76,8 @@ while [[ $# > 0 ]]; do ...@@ -72,7 +76,8 @@ while [[ $# > 0 ]]; do
echo "--mac-only: Do initial download only on Mac systems." echo "--mac-only: Do initial download only on Mac systems."
echo "--run-tests: Run tests after building. Only for local builds." echo "--run-tests: Run tests after building. Only for local builds."
echo "--without-android: Don't build ASan Android runtime library." 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." echo "--with-tools-extra: Also build the clang-tools-extra repository."
exit 1 exit 1
;; ;;
...@@ -102,7 +107,7 @@ function on_asan_mac_host { ...@@ -102,7 +107,7 @@ function on_asan_mac_host {
} }
# Use older Clang for ASan Mac builds. See http://crbug.com/170629. # 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} CLANG_REVISION=${CLANG_ASAN_MAC_REVISION}
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment