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

Unified Diff: build/gyp_chromium

Issue 167373004: Fix automatic toolchain when msvs-ninja in GYP_GENERATORS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 6ab07d6db498ad0b7a4058546d7dce165891b1fc..e4cafc756134c35dc51c7ec3ea111bfef5157653 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'))
« 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