| OLD | NEW |
| 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/config/win/visual_studio_version.gni") |
| 6 import("//build/toolchain/goma.gni") | 6 import("//build/toolchain/goma.gni") |
| 7 | 7 |
| 8 # Should only be running on Windows. | 8 # Should only be running on Windows. |
| 9 assert(is_win) | 9 assert(is_win) |
| 10 | 10 |
| 11 # Setup the Visual Studio state. | 11 # Setup the Visual Studio state. |
| 12 # | 12 # |
| 13 # 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 |
| 14 # "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 |
| 15 # list to us. | 15 # list to us. |
| 16 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", |
| 17 root_build_dir) | 17 root_build_dir) |
| 18 exec_script("setup_toolchain.py", | 18 exec_script("setup_toolchain.py", |
| 19 [ visual_studio_path, gyp_win_tool_path, windows_sdk_path ], | 19 [ visual_studio_path, gyp_win_tool_path, windows_sdk_path ], |
| 20 "string") | 20 "string") |
| 21 | 21 |
| 22 stamp_command = "$python_path gyp-win-tool stamp \$out" | 22 stamp_command = "$python_path gyp-win-tool stamp \$out" |
| 23 copy_command = "$python_path gyp-win-tool recursive-mirror \$in \$out" | 23 copy_command = "$python_path gyp-win-tool recursive-mirror \$in \$out" |
| 24 | 24 |
| 25 if (use_goma) { | |
| 26 # Add the Goma compiler prefixes to the GYP file. | |
| 27 gyp_header = "'make_global_settings': [ $make_goma_global_settings ]," | |
| 28 } | |
| 29 | |
| 30 # 32-bit toolchain ------------------------------------------------------------- | 25 # 32-bit toolchain ------------------------------------------------------------- |
| 31 | 26 |
| 32 toolchain("32") { | 27 toolchain("32") { |
| 33 # Make these apply to all tools below. | 28 # Make these apply to all tools below. |
| 34 lib_prefix = "" | 29 lib_prefix = "" |
| 35 lib_dir_prefix="/LIBPATH:" | 30 lib_dir_prefix="/LIBPATH:" |
| 36 | 31 |
| 37 cc_command = "ninja -t msvc -e environment.x86 -- cl.exe /nologo /showIncludes
/FC @\$out.rsp /c \$in /Fo\$out /Fd\$pdbname" | 32 cc_command = "ninja -t msvc -e environment.x86 -- cl.exe /nologo /showIncludes
/FC @\$out.rsp /c \$in /Fo\$out /Fd\$pdbname" |
| 38 tool("cc") { | 33 tool("cc") { |
| 39 command = cc_command | 34 command = cc_command |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 141 |
| 147 # When invoking this toolchain not as the default one, these args will be | 142 # When invoking this toolchain not as the default one, these args will be |
| 148 # passed to the build. They are ignored when this is the default toolchain. | 143 # passed to the build. They are ignored when this is the default toolchain. |
| 149 toolchain_args() { | 144 toolchain_args() { |
| 150 cpu_arch = "x64" | 145 cpu_arch = "x64" |
| 151 # Normally the build config resets the CPU architecture to 32-bits. Setting | 146 # Normally the build config resets the CPU architecture to 32-bits. Setting |
| 152 # this flag overrides that behavior. | 147 # this flag overrides that behavior. |
| 153 force_win64 = true | 148 force_win64 = true |
| 154 } | 149 } |
| 155 } | 150 } |
| OLD | NEW |