summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-19 21:54:40 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-19 21:54:40 +0000
commitcfc5ec6168bcfd953bc391890c87358cc2a73cea (patch)
tree678aeb4ca4a4bea960c2333db6973c14ab8e6910 /tools/clang
parent0b4fc6a04202520560b91598f50fbd86469f8a2d (diff)
downloadchromium_src-cfc5ec6168bcfd953bc391890c87358cc2a73cea.zip
chromium_src-cfc5ec6168bcfd953bc391890c87358cc2a73cea.tar.gz
chromium_src-cfc5ec6168bcfd953bc391890c87358cc2a73cea.tar.bz2
Clang update.py: check for LLVM_FORCE_HEAD_REVISION in the environment
The FYI builders will set this to enforce using the latest revision. BUG=82385 NOTRY=true Review URL: https://codereview.chromium.org/336163004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
-rwxr-xr-xtools/clang/scripts/update.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 89c5b1f..97b1d0c 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -20,8 +20,8 @@ LLVM_WIN_REVISION = 'HEAD'
# ASan on Windows is useful enough to use it even while the clang/win is still
# in bringup. Use a pinned revision to make it slightly more stable.
-if (sys.platform in ['win32', 'cygwin'] and
- re.search(r'\b(asan)=1', os.environ.get('GYP_DEFINES', ''))):
+if (re.search(r'\b(asan)=1', os.environ.get('GYP_DEFINES', '')) and
+ not 'LLVM_FORCE_HEAD_REVISION' in os.environ):
LLVM_WIN_REVISION = '210586'
# Path constants. (All of these should be absolute paths.)