From d775b2ac05d473db490d2dc6babd2743b28cfbf5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Jul 2022 15:47:43 -0600 Subject: [PATCH] package/pkg-cargo: set RUSTFLAGS for host in HOST_PKG_CARGO_ENV Move RUSTFLAGS for host builds to HOST_PKG_CARGO_ENV so that they are set for host cargo builds which don't use the cargo infrastructure, e.g. python packages that include rust code. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/pkg-cargo.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 666c5ac971..5600c8e97e 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -57,7 +57,8 @@ ifeq ($(NORMALIZED_ARCH),arm) endif HOST_PKG_CARGO_ENV = \ - $(PKG_COMMON_CARGO_ENV) + $(PKG_COMMON_CARGO_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and @@ -130,7 +131,6 @@ else # ifeq ($(4),target) define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ @@ -171,7 +171,6 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \