rust-lang: Add an Host/Compile helper as well

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

diff --git a/lang/rust/maturin/Makefile b/lang/rust/maturin/Makefile
index 0249bf9ad7effb8a26c00beef7c98d261d3d80e2..c2ed4bcd14f3275095ee62cf90ba32d215cc810c 100644 (file)
--- a/lang/rust/maturin/Makefile
+++ b/lang/rust/maturin/Makefile
@@ -36,12 +36,7 @@ define Package/maturin
 endef
 
 define Host/Compile
-       ( \
-               cd $(HOST_BUILD_DIR) ; \
-               export PATH="$(CARGO_HOME)/bin:$(PATH)" ; \
-               CARGO_HOME=$(CARGO_HOME) \
-               cargo install --path . --root $(HOST_BUILD_DIR) ; \
-       )
+       $(call Host/Compile/Cargo)
 endef
 
 define Package/maturin/description
@@ -51,7 +46,7 @@ endef
 
 define Host/Install
        $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/maturin $(STAGING_DIR_HOSTPKG)/bin/maturin
+       $(INSTALL_BIN) $(HOST_INSTALL_DIR)/bin/maturin $(STAGING_DIR_HOSTPKG)/bin/maturin
 endef
 
 $(eval $(call HostBuild))

diff --git a/lang/rust/rust-package.mk b/lang/rust/rust-package.mk
index 472417a61797ec958bc32d423a3cd95ed44e06db..54c2aa89ac5be0accc2e214562359f02f3229d74 100644 (file)
--- a/lang/rust/rust-package.mk
+++ b/lang/rust/rust-package.mk
@@ -5,6 +5,17 @@
 rust_mk_path:=$(dir $(lastword $(MAKEFILE_LIST)))
 include $(rust_mk_path)rust-host.mk
 
+# $(1) path to the package
+# $(2) additional arguments to cargo
+define Host/Compile/Cargo
+       ( \
+               cd $(HOST_BUILD_DIR) ; \
+               export PATH="$(CARGO_HOME)/bin:$(PATH)" ; \
+               CARGO_HOME=$(CARGO_HOME) CC=$(HOSTCC) \
+                       cargo install -v --profile stripped --root $(HOST_INSTALL_DIR) --path "$(if $(strip $(1)),$(strip $(1)),.)" $(2) ; \
+       )
+endef
+
 # $(1) path to the package
 # $(2) additional arguments to cargo
 define Build/Compile/Cargo