Merge "Emit linked file and dep-info in one call to rustc"

2019-10-01 20:44:57 +00:00 · 2019-10-01 20:44:57 +00:00 · 2cca3a0668
parent f856c005cb 885f1c697d
commit 2cca3a0668
1 changed files with 1 additions and 2 deletions
--- a/rust/builder.go
+++ b/rust/builder.go
@ -29,8 +29,7 @@ var (
 			Command: "$rustcCmd " +
 				"-C linker=${config.RustLinker} " +
 				"-C link-args=\"${crtBegin} ${config.RustLinkerArgs} ${linkFlags} ${crtEnd}\" " +
-				"-o $out $in ${libFlags} $rustcFlags " +
-				"&& $rustcCmd --emit=dep-info -o $out.d $in ${libFlags} $rustcFlags",
+				"--emit link -o $out --emit dep-info=$out.d $in ${libFlags} $rustcFlags",
 			CommandDeps: []string{"$rustcCmd"},
 			Depfile:     "$out.d",
 			Deps:        blueprint.DepsGCC, // Rustc deps-info writes out make compatible dep files: https://github.com/rust-lang/rust/issues/7633