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

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

Issue 137993014: Fix Windows GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« build/config/BUILDCONFIG.gn ('K') | « build/config/BUILDCONFIG.gn ('k') | no next file » | 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/toolchain/goma.gni") 5 import("//build/toolchain/goma.gni")
6 6
7 # Should only be running on Windows. 7 # Should only be running on Windows.
8 assert(is_win) 8 assert(is_win)
9 9
10 import("//build/config/win/visual_studio_version.gni") 10 import("//build/config/win/visual_studio_version.gni")
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 tool("rc") { 52 tool("rc") {
53 command = "$python_path gyp-win-tool rc-wrapper environment.x86 rc.exe \$def ines \$includes \$rcflags /fo\$out \$in" 53 command = "$python_path gyp-win-tool rc-wrapper environment.x86 rc.exe \$def ines \$includes \$rcflags /fo\$out \$in"
54 description = "RC \$in" 54 description = "RC \$in"
55 } 55 }
56 tool("asm") { 56 tool("asm") {
57 command = "$python_path gyp-win-tool asm-wrapper environment.x86 ml.exe \$de fines \$includes /c /Fo \$out \$in" 57 command = "$python_path gyp-win-tool asm-wrapper environment.x86 ml.exe \$de fines \$includes /c /Fo \$out \$in"
58 description = "ASM \$in" 58 description = "ASM \$in"
59 } 59 }
60 tool("alink") { 60 tool("alink") {
61 command = "$python_path gyp-win-tool link-wrapper environment.x86 lib.exe /n ologo /ignore:4221 /OUT:\$out @\$out.rsp" 61 command = "$python_path gyp-win-tool link-wrapper environment.x86 False lib. exe /nologo /ignore:4221 /OUT:\$out @\$out.rsp"
62 description = "LIB \$out" 62 description = "LIB \$out"
63 rspfile = "\$out.rsp" 63 rspfile = "\$out.rsp"
64 rspfile_content = "\$in_newline \$libflags" 64 rspfile_content = "\$in_newline \$libflags"
65 } 65 }
66 tool("solink") { 66 tool("solink") {
67 command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x86 lin k.exe /nologo \$implibflag /DLL /OUT:\$dll /PDB:\$dll.pdb @\$dll.rsp && $python_ path gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist \$dll.manifes t del \$dll.manifest && $python_path gyp-win-tool manifest-wrapper environment.x 86 mt.exe -nologo -manifest \$manifests -out:\$dll.manifest" 67 command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x86 lin k.exe /nologo \$implibflag /DLL /OUT:\$dll /PDB:\$dll.pdb @\$dll.rsp && $python_ path gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist \$dll.manifes t del \$dll.manifest && $python_path gyp-win-tool manifest-wrapper environment.x 86 mt.exe -nologo -manifest \$manifests -out:\$dll.manifest"
68 description = "LINK(DLL) \$dll" 68 description = "LINK(DLL) \$dll"
69 restat = "1" 69 restat = "1"
70 rspfile = "\$dll.rsp" 70 rspfile = "\$dll.rsp"
71 rspfile_content = "\$libs \$in_newline \$ldflags" 71 rspfile_content = "\$libs \$in_newline \$ldflags"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 # When invoking this toolchain not as the default one, these args will be 147 # When invoking this toolchain not as the default one, these args will be
148 # passed to the build. They are ignored when this is the default toolchain. 148 # passed to the build. They are ignored when this is the default toolchain.
149 toolchain_args() { 149 toolchain_args() {
150 cpu_arch = "x64" 150 cpu_arch = "x64"
151 # Normally the build config resets the CPU architecture to 32-bits. Setting 151 # Normally the build config resets the CPU architecture to 32-bits. Setting
152 # this flag overrides that behavior. 152 # this flag overrides that behavior.
153 force_win64 = true 153 force_win64 = true
154 } 154 }
155 } 155 }
OLDNEW
« build/config/BUILDCONFIG.gn ('K') | « build/config/BUILDCONFIG.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698