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

Unified Diff: buildbot/buildbot_lib.py

Issue 1920843007: Update chrome_rev (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: just punt GYP_MSVS_VERSION setting Created 4 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 | « DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: buildbot/buildbot_lib.py
diff --git a/buildbot/buildbot_lib.py b/buildbot/buildbot_lib.py
index 58b2f0e2e3b278c6c330da75a7acf804892de70c..eb719296d335e6058023d281b19f794039c6b66b 100644
--- a/buildbot/buildbot_lib.py
+++ b/buildbot/buildbot_lib.py
@@ -79,6 +79,10 @@ def SetupWindowsEnvironment(context):
# Poke around looking for MSVC. We should do something more principled in
# the future.
+ # NOTE! This affects only SCons. The GN build figures out MSVC on its own
+ # and will wind up with a different version than this one (the same version
+ # being used for Chromium builds).
+
# The name of Program Files can differ, depending on the bittage of Windows.
program_files = r'c:\Program Files (x86)'
if not os.path.exists(program_files):
@@ -96,7 +100,6 @@ def SetupWindowsEnvironment(context):
for dirname, comntools_var, gyp_msvs_version in msvc_locs:
msvc = os.path.join(program_files, dirname)
- context.SetEnv('GYP_MSVS_VERSION', gyp_msvs_version)
if os.path.exists(msvc):
break
else:
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698