浏览代码

package/pkg-cargo.mk: use CARGO_BUILD_TARGET instead of --target

This will allow PKG_CARGO_ENV to be used in other contexts, such as
the upcoming python-cryptography version bump.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Thomas Petazzoni 3 年之前
父节点
当前提交
91a5a2d317
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      package/pkg-cargo.mk

+ 2 - 3
package/pkg-cargo.mk

@@ -42,7 +42,8 @@ PKG_CARGO_ENV = \
 	$(PKG_COMMON_CARGO_ENV) \
 	__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \
 	CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \
-	CARGO_TARGET_APPLIES_TO_HOST="false"
+	CARGO_TARGET_APPLIES_TO_HOST="false" \
+	CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)"
 
 HOST_PKG_CARGO_ENV = \
 	$(PKG_COMMON_CARGO_ENV)
@@ -102,7 +103,6 @@ define $(2)_BUILD_CMDS
 		$$($(2)_CARGO_ENV) \
 		cargo build \
 			--offline \
-			--target $$(RUSTC_TARGET_NAME) \
 			$$(if $$(BR2_ENABLE_DEBUG),--debug,--release) \
 			--manifest-path Cargo.toml \
 			--locked \
@@ -138,7 +138,6 @@ define $(2)_INSTALL_TARGET_CMDS
 		$$(PKG_CARGO_ENV) \
 		$$($(2)_CARGO_ENV) \
 		cargo install \
-			--target $$(RUSTC_TARGET_NAME) \
 			--offline \
 			--root $$(TARGET_DIR)/usr/ \
 			--bins \