diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 20:10:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 20:10:43 +0000 |
| commit | d652c33131ef384aea1f3a794957c1154fbc599d (patch) | |
| tree | b2949a4447ab915401cb99fe5e0c0068e1a5f6c0 /build/gyp_chromium | |
| parent | ec4a678eab334528fcefb28ab3e95da1b27c31ea (diff) | |
| download | chromium_src-d652c33131ef384aea1f3a794957c1154fbc599d.zip chromium_src-d652c33131ef384aea1f3a794957c1154fbc599d.tar.gz chromium_src-d652c33131ef384aea1f3a794957c1154fbc599d.tar.bz2 | |
Fix automatic toolchain when msvs-ninja in GYP_GENERATORS
Previously, we checked that GYP_GENERATORS was "ninja", but this
broke when using GYP_GENERATORS=ninja,msvs-ninja. As there are no
other supported genearators than those two now, there's no need
to check that we're using ninja at all, so just remove that
branch of the if.
BUG=323300
R=jschuh@chromium.org
Review URL: https://codereview.chromium.org/167373004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index 6ab07d6..e4cafc7 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -434,11 +434,10 @@ if __name__ == '__main__': not 'OS=ios' in os.environ.get('GYP_DEFINES', []): os.environ['GYP_GENERATORS'] = 'ninja' - # If using ninja on windows, and the automatic toolchain has been installed - # by depot_tools, then use it. + # 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') and - os.environ.get('GYP_GENERATORS') == 'ninja'): + if sys.platform in ('win32', 'cygwin'): depot_tools_path = find_depot_tools.add_depot_tools_to_path() toolchain = os.path.normpath(os.path.join( depot_tools_path, 'win_toolchain', 'vs2013_files')) |