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

Side by Side Diff: build/toolchain/win/BUILD.gn

Issue 217273004: Pull GN @ r262225 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/toolchain/nacl/BUILD.gn ('k') | tools/gn/bin/linux/gn.sha1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/win/visual_studio_version.gni")
5 import("//build/toolchain/goma.gni") 6 import("//build/toolchain/goma.gni")
6 7
7 # Should only be running on Windows. 8 # Should only be running on Windows.
8 assert(is_win) 9 assert(is_win)
9 10
10 import("//build/config/win/visual_studio_version.gni")
11
12 # Setup the Visual Studio state. 11 # Setup the Visual Studio state.
13 # 12 #
14 # Its arguments are the VS path and the compiler wrapper tool. It will write 13 # Its arguments are the VS path and the compiler wrapper tool. It will write
15 # "environment.x86" and "environment.x64" to the build directory and return a 14 # "environment.x86" and "environment.x64" to the build directory and return a
16 # list to us. 15 # list to us.
17 gyp_win_tool_path = rebase_path("//tools/gyp/pylib/gyp/win_tool.py", 16 gyp_win_tool_path = rebase_path("//tools/gyp/pylib/gyp/win_tool.py",
18 root_build_dir) 17 root_build_dir)
19 exec_script("setup_toolchain.py", 18 exec_script("setup_toolchain.py",
20 [ visual_studio_path, gyp_win_tool_path, windows_sdk_path ], 19 [ visual_studio_path, gyp_win_tool_path, windows_sdk_path ],
21 "string") 20 "string")
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 146
148 # When invoking this toolchain not as the default one, these args will be 147 # When invoking this toolchain not as the default one, these args will be
149 # passed to the build. They are ignored when this is the default toolchain. 148 # passed to the build. They are ignored when this is the default toolchain.
150 toolchain_args() { 149 toolchain_args() {
151 cpu_arch = "x64" 150 cpu_arch = "x64"
152 # Normally the build config resets the CPU architecture to 32-bits. Setting 151 # Normally the build config resets the CPU architecture to 32-bits. Setting
153 # this flag overrides that behavior. 152 # this flag overrides that behavior.
154 force_win64 = true 153 force_win64 = true
155 } 154 }
156 } 155 }
OLDNEW
« no previous file with comments | « build/toolchain/nacl/BUILD.gn ('k') | tools/gn/bin/linux/gn.sha1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698