build/toolchain/win/BUILD.gn - Issue 1418653002: Synchronize GN build configuration with Chrome

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/toolchain/win/BUILD.gn

Issue 1418653002: Synchronize GN build configuration with Chrome (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Use public_deps instead of deps Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/toolchain/win/BUILD.gn

diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn

index 4936c3d0cfc883641333be7dca2617b5fa3eadab..d13f5fb96190a04951c214fef8a878e094632a03 100644

--- a/build/toolchain/win/BUILD.gn

+++ b/build/toolchain/win/BUILD.gn

@@ -115,7 +115,7 @@ template("msvc_toolchain") {

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}} {{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.

description = "ASM {{output}}"

outputs = [

"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",