Commit f786c2b9 by Roland McGrath Committed by Jamie Madill

GN: Use $root_out_dir in in copy_compiler_dll rule

The root_build_dir variable yields the root of the build tree. But when the component is being built under a non-default toolchain, its output files are delivered to a toolchain subdirectory instead. The copy_compiler_dll rule should put its output next to where libANGLE and things built using it will go, which is root_out_dir. This fixes cases where the angle GN component is instantiated under more than one toolchain, which heretofore would produce multiple Ninja rules for the same target file $root_build_dir/d3dcompiler_47.dll and thus get complaints from Ninja. BUG=512869 Change-Id: I9fe83c5c5fa74902ef270654d3707636588af6b7 Reviewed-on: https://chromium-review.googlesource.com/320119Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarRoland McGrath <mcgrathr@chromium.org>
parent 69bbc98e
...@@ -46,7 +46,7 @@ config("internal_config") { ...@@ -46,7 +46,7 @@ config("internal_config") {
if (is_win) { if (is_win) {
copy("copy_compiler_dll") { copy("copy_compiler_dll") {
sources = [ "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll" ] sources = [ "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll" ]
outputs = [ "$root_build_dir/d3dcompiler_47.dll" ] outputs = [ "$root_out_dir/d3dcompiler_47.dll" ]
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment