From 20406b715946887902e40ffcf8815a90dcb5faaf Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Mar 2024 00:29:40 +0100 Subject: [PATCH] package/rust: provide RUSTFLAGS for cargo While building the rust toolchain, the build system ends up using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tools like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provides cargo binary) and our cargo environment variables [1] are not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Add $(HOST_PKG_CARGO_ENV) in HOST_RUST_BUILD_CMDS since it already includes RUSTFLAGS but also CARGO_HOME. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk#L165 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4903060368..c544582c99 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -70,7 +70,8 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_PKG_CARGO_ENV) \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \