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

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

Issue 502163002: Fix GN toolchains to use proper out dir. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain/mac/BUILD.gn ('k') | components/variations.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/win/BUILD.gn
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 0a5cf87ad40213301f8e5c1f5540363de1e1d416..87688efd2b55b92309ba0a5c8ecd20b3addca0f0 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -87,8 +87,8 @@ template("msvc_toolchain") {
}
tool("solink") {
- dllname = "{{target_output_name}}{{output_extension}}" # e.g. foo.dll
- libname = "{{target_output_name}}{{output_extension}}.lib" # e.g. foo.dll.lib
+ dllname = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" # e.g. foo.dll
+ libname = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.lib" # e.g. foo.dll.lib
rspfile = "${dllname}.rsp"
link_command = "$python_path gyp-win-tool link-wrapper $env False link.exe /nologo /IMPLIB:$libname /DLL /OUT:$dllname /PDB:${dllname}.pdb @$rspfile"
@@ -122,7 +122,7 @@ template("msvc_toolchain") {
default_output_extension = ".exe"
description = "LINK {{output}}"
outputs = [
- "{{target_output_name}}{{output_extension}}",
+ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}",
]
# The use of inputs_newline is to work around a fixed per-line buffer
# size in the linker.
« no previous file with comments | « build/toolchain/mac/BUILD.gn ('k') | components/variations.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698