From e7327aeafca93c68bcc120180d0cea1cd8cf1667 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 10 Feb 2022 16:29:26 +0100 Subject: [PATCH] package/pkg-cargo: host-rustc is also a build dependency Currently, host-rustc is a download dependency, because we need cargo for the vendoring during the download step. However, when using a package in override-srcdir, there is no download step, so host-rustc is not pulled in as a dependency which breaks running the build of a single package from scratch: $ make clean $ make my-rust-package [...] [...] cargo build --offline --release --manifest-path Cargo.toml --locked /bin/sh: cargo: command not found We fix that by adding host-rustc as a standard dependency too. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 8b246abfed..6f5125f1d4 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -65,8 +65,10 @@ HOST_PKG_CARGO_ENV = \ define inner-cargo-package -# We need host-rustc to run cargo +# We need host-rustc to run cargo at download time (for vendoring), +# and at build and install time. $(2)_DOWNLOAD_DEPENDENCIES += host-rustc +$(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo