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 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 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 | 64 |
| 65 tool("rc") { | 65 tool("rc") { |
| 66 command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{ include_dirs}} /fo{{output}} {{source}}" | 66 command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{ include_dirs}} /fo{{output}} {{source}}" |
| 67 outputs = [ | 67 outputs = [ |
| 68 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res", | 68 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res", |
| 69 ] | 69 ] |
| 70 description = "RC {{output}}" | 70 description = "RC {{output}}" |
| 71 } | 71 } |
| 72 | 72 |
| 73 tool("asm") { | 73 tool("asm") { |
| 74 command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} { {include_dirs}} /c /Fo {{output}} {{source}}" | 74 command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} { {include_dirs}} /safeseh /c /Fo {{output}} {{source}}" |
|
ckocagil
2014/09/25 20:51:06
I put the /safeseh here but ideally this should be
brettw
2014/09/29 16:45:24
Looks like it. I filed https://code.google.com/p/c
ckocagil
2014/09/29 21:47:09
Done.
| |
| 75 description = "ASM {{output}}" | 75 description = "ASM {{output}}" |
| 76 outputs = [ | 76 outputs = [ |
| 77 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", | 77 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", |
| 78 ] | 78 ] |
| 79 } | 79 } |
| 80 | 80 |
| 81 tool("alink") { | 81 tool("alink") { |
| 82 rspfile = "{{output}}.rsp" | 82 rspfile = "{{output}}.rsp" |
| 83 command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nolo go /ignore:4221 /OUT:{{output}} @$rspfile" | 83 command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nolo go /ignore:4221 /OUT:{{output}} @$rspfile" |
| 84 description = "LIB {{output}}" | 84 description = "LIB {{output}}" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 msvc_toolchain("32") { | 165 msvc_toolchain("32") { |
| 166 environment = "environment.x86" | 166 environment = "environment.x86" |
| 167 cpu_arch = "x64" | 167 cpu_arch = "x64" |
| 168 } | 168 } |
| 169 | 169 |
| 170 msvc_toolchain("64") { | 170 msvc_toolchain("64") { |
| 171 environment = "environment.x64" | 171 environment = "environment.x64" |
| 172 cpu_arch = "x64" | 172 cpu_arch = "x64" |
| 173 force_win64 = true | 173 force_win64 = true |
| 174 } | 174 } |
| OLD | NEW |