cargo: use HOST_CARGO_DL_DIR instead of CARGO_DL_DIR
authorMaxime Hadjinlian <maxime.hadjinlian@gmail.com>
Mon, 2 Apr 2018 18:36:22 +0000 (20:36 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Mon, 2 Apr 2018 18:50:50 +0000 (20:50 +0200)
The infrastructure only provides HOST_CARGO_DL_DIR, because this
package is host only. Ideally the infra should provide CARGO_DL_DIR,
but it doesn't currently, and that requires more significant changes.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/cargo/cargo.mk

index 36b2718e9040efb8422739fc8d23a6e2a65461f7..b3174f5b20c46c7cdb7712f93d762eca2855f1a1 100644 (file)
@@ -37,7 +37,7 @@ HOST_CARGO_HOME = $(HOST_DIR)/share/cargo
 define HOST_CARGO_EXTRACT_DEPS
        @mkdir -p $(@D)/vendor
        $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \
-               $(CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \
+               $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \
                $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) -
 endef
 
@@ -46,7 +46,7 @@ HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS
 define HOST_CARGO_EXTRACT_INSTALLER
        @mkdir -p $(@D)/src/rust-installer
        $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \
-               $(CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
+               $(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
                $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) -
 endef