| Index: build/toolchain/win/BUILD.gn
|
| diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
|
| index 1be1cf4949bdc5754735397c2c6a169c835f868f..b8f87e7157acc39d0fc8aa453c1861fd4e2c083f 100644
|
| --- a/build/toolchain/win/BUILD.gn
|
| +++ b/build/toolchain/win/BUILD.gn
|
| @@ -81,12 +81,12 @@ template("msvc_toolchain") {
|
| tool("cc") {
|
| rspfile = "{{output}}.rsp"
|
| pdbname = "{{target_out_dir}}/{{target_output_name}}_c.pdb"
|
| - command =
|
| - "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
| + command = "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
| depsformat = "msvc"
|
| description = "CC {{output}}"
|
| - outputs =
|
| - [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
|
| + outputs = [
|
| + "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
|
| + ]
|
| rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
|
| }
|
|
|
| @@ -95,37 +95,36 @@ template("msvc_toolchain") {
|
|
|
| # The PDB name needs to be different between C and C++ compiled files.
|
| pdbname = "{{target_out_dir}}/{{target_output_name}}_cc.pdb"
|
| - command =
|
| - "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
| + command = "ninja -t msvc -e $env -- $cl /nologo /showIncludes /FC @$rspfile /c {{source}} /Fo{{output}} /Fd$pdbname"
|
| depsformat = "msvc"
|
| description = "CXX {{output}}"
|
| - outputs =
|
| - [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
|
| + outputs = [
|
| + "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
|
| + ]
|
| rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}"
|
| }
|
|
|
| tool("rc") {
|
| - command =
|
| - "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{include_dirs}} /fo{{output}} {{source}}"
|
| - outputs =
|
| - [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res" ]
|
| + command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{include_dirs}} /fo{{output}} {{source}}"
|
| + outputs = [
|
| + "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res",
|
| + ]
|
| description = "RC {{output}}"
|
| }
|
|
|
| tool("asm") {
|
| # TODO(brettw): "/safeseh" assembler argument is hardcoded here. Extract
|
| # assembler flags to a variable like cflags. crbug.com/418613
|
| - command =
|
| - "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} {{include_dirs}} /safeseh /c /Fo {{output}} {{source}}"
|
| + command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} {{include_dirs}} /safeseh /c /Fo {{output}} {{source}}"
|
| description = "ASM {{output}}"
|
| - outputs =
|
| - [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
|
| + outputs = [
|
| + "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
|
| + ]
|
| }
|
|
|
| tool("alink") {
|
| rspfile = "{{output}}.rsp"
|
| - command =
|
| - "$python_path gyp-win-tool link-wrapper $env False lib.exe /nologo /ignore:4221 /OUT:{{output}} @$rspfile"
|
| + command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nologo /ignore:4221 /OUT:{{output}} @$rspfile"
|
| description = "LIB {{output}}"
|
| outputs = [
|
| # Ignore {{output_extension}} and always use .lib, there's no reason to
|
| @@ -145,8 +144,7 @@ template("msvc_toolchain") {
|
| "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.lib" # e.g. foo.dll.lib
|
| rspfile = "${dllname}.rsp"
|
|
|
| - link_command =
|
| - "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /IMPLIB:$libname /DLL /OUT:$dllname /PDB:${dllname}.pdb @$rspfile"
|
| + link_command = "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /IMPLIB:$libname /DLL /OUT:$dllname /PDB:${dllname}.pdb @$rspfile"
|
|
|
| # TODO(brettw) support manifests
|
| #manifest_command = "$python_path gyp-win-tool manifest-wrapper $env mt.exe -nologo -manifest $manifests -out:${dllname}.manifest"
|
| @@ -170,8 +168,7 @@ template("msvc_toolchain") {
|
| tool("link") {
|
| rspfile = "{{output}}.rsp"
|
|
|
| - link_command =
|
| - "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /OUT:{{output}} /PDB:{{output}}.pdb @$rspfile"
|
| + link_command = "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /OUT:{{output}} /PDB:{{output}}.pdb @$rspfile"
|
|
|
| # TODO(brettw) support manifests
|
| #manifest_command = "$python_path gyp-win-tool manifest-wrapper $env mt.exe -nologo -manifest $manifests -out:{{output}}.manifest"
|
| @@ -180,8 +177,9 @@ template("msvc_toolchain") {
|
|
|
| default_output_extension = ".exe"
|
| description = "LINK {{output}}"
|
| - outputs =
|
| - [ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" ]
|
| + outputs = [
|
| + "{{root_out_dir}}/{{target_output_name}}{{output_extension}}",
|
| + ]
|
|
|
| # The use of inputs_newline is to work around a fixed per-line buffer
|
| # size in the linker.
|
|
|