Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Side by Side Diff: build/toolchain/win/BUILD.gn

Issue 603143002: gn: Fix more build issues on Win (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: += instead of = Created 6 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:
View unified diff | Download patch
« no previous file with comments | « build/secondary/third_party/nss/BUILD.gn ('k') | build/vs_toolchain.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 # TODO(brettw): "/safeseh" assembler argument is hardcoded here. Extract
75 # assembler flags to a variable like cflags. crbug.com/418613
76 command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} { {include_dirs}} /safeseh /c /Fo {{output}} {{source}}"
75 description = "ASM {{output}}" 77 description = "ASM {{output}}"
76 outputs = [ 78 outputs = [
77 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", 79 "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
78 ] 80 ]
79 } 81 }
80 82
81 tool("alink") { 83 tool("alink") {
82 rspfile = "{{output}}.rsp" 84 rspfile = "{{output}}.rsp"
83 command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nolo go /ignore:4221 /OUT:{{output}} @$rspfile" 85 command = "$python_path gyp-win-tool link-wrapper $env False lib.exe /nolo go /ignore:4221 /OUT:{{output}} @$rspfile"
84 description = "LIB {{output}}" 86 description = "LIB {{output}}"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 msvc_toolchain("32") { 167 msvc_toolchain("32") {
166 environment = "environment.x86" 168 environment = "environment.x86"
167 cpu_arch = "x64" 169 cpu_arch = "x64"
168 } 170 }
169 171
170 msvc_toolchain("64") { 172 msvc_toolchain("64") {
171 environment = "environment.x64" 173 environment = "environment.x64"
172 cpu_arch = "x64" 174 cpu_arch = "x64"
173 force_win64 = true 175 force_win64 = true
174 } 176 }
OLDNEW
« no previous file with comments | « build/secondary/third_party/nss/BUILD.gn ('k') | build/vs_toolchain.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698