diff options
| author | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 00:45:35 +0000 |
|---|---|---|
| committer | robliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 00:45:35 +0000 |
| commit | 0c9c40d4c9c8628cc0932059c7d0fef4db37cec3 (patch) | |
| tree | 5012dad290cd49d4dc1e19b8069b8ce92361c693 /build | |
| parent | 9d9a9824a60daf32613da7fa0ce674274a5897f6 (diff) | |
| download | chromium_src-0c9c40d4c9c8628cc0932059c7d0fef4db37cec3.zip chromium_src-0c9c40d4c9c8628cc0932059c7d0fef4db37cec3.tar.gz chromium_src-0c9c40d4c9c8628cc0932059c7d0fef4db37cec3.tar.bz2 | |
Fix Landmines MSVS Version Checking
GYP_MSVS_VERSION is not always a number (e.g. it can be 2010e),
causing the int conversion to fail.
BUG=249378
Review URL: https://chromiumcodereview.appspot.com/16978002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/landmines.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/landmines.py b/build/landmines.py index eaaca46..753ad3b 100755 --- a/build/landmines.py +++ b/build/landmines.py @@ -68,8 +68,7 @@ def gyp_defines(): @memoize() def gyp_msvs_version(): - val = os.environ.get('GYP_MSVS_VERSION', '') - return int(val) if val else None + return os.environ.get('GYP_MSVS_VERSION', '') @memoize() def distributor(): @@ -154,7 +153,7 @@ def get_landmines(target): if platform() == 'mac': add('Switching from bundle to unbundled dylib (issue 14743002).') if (platform() == 'win' and builder() == 'ninja' and - gyp_msvs_version() == 2012 and + gyp_msvs_version() == '2012' and gyp_defines().get('target_arch') == 'x64' and gyp_defines().get('dcheck_always_on') == '1'): add("Switched win x64 trybots from VS2010 to VS2012.") |