Commit d652c331 authored by scottmg@chromium.org's avatar scottmg@chromium.org

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
parent ec4a678e
......@@ -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'))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment