| 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/clang/clang.gni") | 5 import("//build/config/clang/clang.gni") |
| 6 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 7 import("//build/config/win/visual_studio_version.gni") | 7 import("//build/config/win/visual_studio_version.gni") |
| 8 import("//build/toolchain/goma.gni") | 8 import("//build/toolchain/goma.gni") |
| 9 import("//build/toolchain/toolchain.gni") | 9 import("//build/toolchain/toolchain.gni") |
| 10 import("//build/toolchain/concurrent_links.gni") | 10 import("//build/toolchain/concurrent_links.gni") |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 | 185 |
| 186 default_output_extension = ".dll" | 186 default_output_extension = ".dll" |
| 187 default_output_dir = "{{root_out_dir}}" | 187 default_output_dir = "{{root_out_dir}}" |
| 188 description = "LINK(DLL) {{output}}" | 188 description = "LINK(DLL) {{output}}" |
| 189 outputs = [ | 189 outputs = [ |
| 190 dllname, | 190 dllname, |
| 191 libname, | 191 libname, |
| 192 ] | 192 ] |
| 193 link_output = libname | 193 link_output = libname |
| 194 depend_output = libname | 194 depend_output = libname |
| 195 |
| 196 # The new version of GN uses a runtime_outputs list rather than a |
| 197 # runtime_link_output string. This needs to be flipped for the next GN |
| 198 # roll. |
| 199 # TODO(brettw) bug 631242: Swap this and remove the old one. |
| 200 #runtime_outputs = [ dllname ] |
| 195 runtime_link_output = dllname | 201 runtime_link_output = dllname |
| 196 | 202 |
| 197 # Since the above commands only updates the .lib file when it changes, ask | 203 # Since the above commands only updates the .lib file when it changes, ask |
| 198 # Ninja to check if the timestamp actually changed to know if downstream | 204 # Ninja to check if the timestamp actually changed to know if downstream |
| 199 # dependencies should be recompiled. | 205 # dependencies should be recompiled. |
| 200 restat = true | 206 restat = true |
| 201 | 207 |
| 202 # The use of inputs_newline is to work around a fixed per-line buffer | 208 # The use of inputs_newline is to work around a fixed per-line buffer |
| 203 # size in the linker. | 209 # size in the linker. |
| 204 rspfile_content = "{{libs}} {{solibs}} {{inputs_newline}} {{ldflags}}" | 210 rspfile_content = "{{libs}} {{solibs}} {{inputs_newline}} {{ldflags}}" |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 | 419 |
| 414 msvc_toolchain("winrt_x64") { | 420 msvc_toolchain("winrt_x64") { |
| 415 environment = "environment.winrt_x64" | 421 environment = "environment.winrt_x64" |
| 416 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\"" | 422 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\"" |
| 417 is_clang = false | 423 is_clang = false |
| 418 | 424 |
| 419 toolchain_cpu = "x64" | 425 toolchain_cpu = "x64" |
| 420 toolchain_os = current_os | 426 toolchain_os = current_os |
| 421 } | 427 } |
| 422 } | 428 } |
| OLD | NEW |