Merge pull request #28 from rust-embedded/fix-caching-issues

Fix caching issues

Author: nastevens

classes/rust-common.bbclass

@@ -8,6 +8,10 @@ def rust_target(d, spec_type):
     arch = d.getVar('%s_ARCH' % spec_type, True)
     os = d.getVar('%s_OS' % spec_type, True)
 
+    # Make sure that tasks properly recalculate after ARCH or OS change
+    d.appendVarFlag("rust_target", "vardeps", " %s_ARCH" % spec_type)
+    d.appendVarFlag("rust_target", "vardeps", " %s_OS" % spec_type)
+
     # Sometimes bitbake mixes the calling convention into the OS, sometimes it
     # doesn't... let's just take the first part
     os = os.split('-')[0]

recipes-devtools/rust/cargo-bin-cross.inc

@@ -36,6 +36,9 @@ python () {
                  (cargo_url(target), cargo_md5(target), cargo_sha256(target),
                   d.getVar("PN", True) + "-" + pv + "-" + target + ".tar.gz"))
     src_uri = d.getVar("SRC_URI", True).split()
+    cargo_extract_path = cargo_url(target).split('/')[-1].replace('.tar.gz', '')
     d.setVar("SRC_URI", ' '.join(src_uri + [cargo_uri]))
-    d.setVar("S", "{}/{}".format(d.getVar("WORKDIR", True), cargo_url(target).split('/')[-1].replace('.tar.gz', '')))
+    d.setVar("S", "${{WORKDIR}}/{}".format(cargo_extract_path))
+    d.appendVarFlag("S", "vardeps", " cargo_url")
+    d.appendVarFlag("S", "vardepsexclude", " WORKDIR")
 }

recipes-devtools/rust/rust-bin-cross.inc

@@ -22,6 +22,9 @@ RUST_ALL_TARGETS = "${RUST_BUILD_TARGET} ${RUST_TARGET_TARGET} ${EXTRA_RUST_TARG
 
 S = "${WORKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}"
 
+# Relocating WORKDIR doesn't matter to installer
+S[vardepsexclude] += "WORKDIR"
+
 SYSROOT_DIRS_NATIVE += "${prefix}"
 SYSROOT_DIRS_BLACKLIST += "\
     ${prefix}/share \