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

Unified Diff: build/gyp_chromium

Issue 174143003: Don't use automatic toolchain if GYP_MSVS_VERSION overridden to another version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 6 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: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index b19e4805282cecff547758a15078a38986c2311d..49d004482db9246ae4604e524ccc33b22cf571d0 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -441,7 +441,10 @@ if __name__ == '__main__':
# If on windows, and the automatic toolchain has been installed by
# depot_tools, then use it.
vs2013_runtime_dll_dirs = None
- if sys.platform in ('win32', 'cygwin'):
+ # If MSVS_VERSION is explicitly specified to be something other than 2013,
+ # don't use the automatic toolchain, as it currently only supports VS2013.
+ msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013')
+ if sys.platform in ('win32', 'cygwin') and msvs_version.startswith('2013'):
import find_depot_tools
depot_tools_path = find_depot_tools.add_depot_tools_to_path()
toolchain = os.path.normpath(os.path.join(
« 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