commit 885f1c697d61a08e33c3199113fe8b86562b065b
author Chih-Hung Hsieh <chh@google.com> Sun Sep 29 22:38:31 2019 -0700
committer Chih-Hung Hsieh <chh@google.com> Mon Sep 30 14:12:35 2019 -0700
tree 10deb895c1d15e568ceed373b1f01dc7b69eb032
parent 852116a061d8a339d0bca72744941537bcdba7ca

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

Bug: 141858619
Test: mm in projects with Rust modules
Change-Id: I05a2e06caa177f95bc2ad3691a5f48294051a212

rust/builder.go

diff --git a/rust/builder.go b/rust/builder.go
index 6611492..104313f 100644
--- a/rust/builder.go
+++ b/rust/builder.go
@@ -29,8 +29,7 @@
 			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