Chromium Code Reviews| 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 declare_args() { | 5 declare_args() { |
| 6 # Path to the directory containing the VC binaries for the right | 6 # Path to the directory containing the VC binaries for the right |
| 7 # combination of host and target architectures. Currently only the | 7 # combination of host and target architectures. Currently only the |
| 8 # 64-bit host toolchain is supported, with either 32-bit or 64-bit targets. | 8 # 64-bit host toolchain is supported, with either 32-bit or 64-bit targets. |
| 9 # If vc_bin_dir is not specified on the command line (and it normally | 9 # If vc_bin_dir is not specified on the command line (and it normally |
| 10 # isn't), we will dynamically determine the right value to use at runtime. | 10 # isn't), we will dynamically determine the right value to use at runtime. |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{ include_dirs}} /fo{{output}} {{source}}" | 108 command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{ include_dirs}} /fo{{output}} {{source}}" |
| 109 outputs = [ | 109 outputs = [ |
| 110 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res", | 110 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res", |
| 111 ] | 111 ] |
| 112 description = "RC {{output}}" | 112 description = "RC {{output}}" |
| 113 } | 113 } |
| 114 | 114 |
| 115 tool("asm") { | 115 tool("asm") { |
| 116 # TODO(brettw): "/safeseh" assembler argument is hardcoded here. Extract | 116 # TODO(brettw): "/safeseh" assembler argument is hardcoded here. Extract |
| 117 # assembler flags to a variable like cflags. crbug.com/418613 | 117 # assembler flags to a variable like cflags. crbug.com/418613 |
| 118 command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} { {include_dirs}} /safeseh /c /Fo {{output}} {{source}}" | 118 command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} { {include_dirs}} {{asmflags}} /c /Fo{{output}} {{source}}" |
|
jamesr
2015/10/21 00:32:10
why are we patching a windows toolchain file?
Petr Hosek
2015/10/21 02:23:42
Dropped.
| |
| 119 description = "ASM {{output}}" | 119 description = "ASM {{output}}" |
| 120 outputs = [ | 120 outputs = [ |
| 121 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", | 121 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", |
| 122 ] | 122 ] |
| 123 } | 123 } |
| 124 | 124 |
| 125 tool("alink") { | 125 tool("alink") { |
| 126 rspfile = "{{output}}.rsp" | 126 rspfile = "{{output}}.rsp" |
| 127 command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nolo go /ignore:4221 /OUT:{{output}} @$rspfile" | 127 command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nolo go /ignore:4221 /OUT:{{output}} @$rspfile" |
| 128 description = "LIB {{output}}" | 128 description = "LIB {{output}}" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 238 } | 238 } |
| 239 msvc_toolchain("clang_x64") { | 239 msvc_toolchain("clang_x64") { |
| 240 environment = "environment.x64" | 240 environment = "environment.x64" |
| 241 current_cpu = "x64" | 241 current_cpu = "x64" |
| 242 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", | 242 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", |
| 243 root_build_dir) | 243 root_build_dir) |
| 244 cl = "${goma_prefix}$prefix/clang-cl.exe" | 244 cl = "${goma_prefix}$prefix/clang-cl.exe" |
| 245 is_clang = true | 245 is_clang = true |
| 246 } | 246 } |
| 247 } | 247 } |
| OLD | NEW |