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

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

Issue 2031233002: Rework how MB and GN handle concurrent links. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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/sanitizers/sanitizers.gni") 5 import("//build/config/sanitizers/sanitizers.gni")
6 import("//build/config/win/visual_studio_version.gni") 6 import("//build/config/win/visual_studio_version.gni")
7 import("//build/toolchain/goma.gni") 7 import("//build/toolchain/goma.gni")
8 import("//build/toolchain/toolchain.gni") 8 import("//build/toolchain/toolchain.gni")
9 9
10 # Should only be running on Windows. 10 # Should only be running on Windows.
11 assert(is_win) 11 assert(is_win)
12 12
13 # Setup the Visual Studio state. 13 # Setup the Visual Studio state.
14 # 14 #
15 # Its arguments are the VS path and the compiler wrapper tool. It will write 15 # Its arguments are the VS path and the compiler wrapper tool. It will write
16 # "environment.x86" and "environment.x64" to the build directory and return a 16 # "environment.x86" and "environment.x64" to the build directory and return a
17 # list to us. 17 # list to us.
18 gyp_win_tool_path = 18 gyp_win_tool_path =
19 rebase_path("//tools/gyp/pylib/gyp/win_tool.py", root_build_dir) 19 rebase_path("//tools/gyp/pylib/gyp/win_tool.py", root_build_dir)
20 20
21 if (use_goma) { 21 if (use_goma) {
22 goma_prefix = "$goma_dir/gomacc.exe " 22 goma_prefix = "$goma_dir/gomacc.exe "
23 } else { 23 } else {
24 goma_prefix = "" 24 goma_prefix = ""
25 } 25 }
26 26
27 # This value will be inherited in the toolchain below.
28 concurrent_links = exec_script("../get_concurrent_links.py", [], "value")
29
30 # Copy the VS runtime DLL for the default toolchain to the root build directory 27 # Copy the VS runtime DLL for the default toolchain to the root build directory
31 # so things will run. 28 # so things will run.
32 if (current_toolchain == default_toolchain) { 29 if (current_toolchain == default_toolchain) {
33 if (is_debug) { 30 if (is_debug) {
34 configuration_name = "Debug" 31 configuration_name = "Debug"
35 } else { 32 } else {
36 configuration_name = "Release" 33 configuration_name = "Release"
37 } 34 }
38 exec_script("../../vs_toolchain.py", 35 exec_script("../../vs_toolchain.py",
39 [ 36 [
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 413
417 msvc_toolchain("winrt_x64") { 414 msvc_toolchain("winrt_x64") {
418 environment = "environment.winrt_x64" 415 environment = "environment.winrt_x64"
419 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\"" 416 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\""
420 is_clang = false 417 is_clang = false
421 418
422 toolchain_cpu = "x64" 419 toolchain_cpu = "x64"
423 toolchain_os = current_os 420 toolchain_os = current_os
424 } 421 }
425 } 422 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698