diff options
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/rust/rust-snapshot.inc | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/rust.inc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc index 74b558262f..173648c889 100644 --- a/meta/recipes-devtools/rust/rust-snapshot.inc +++ b/meta/recipes-devtools/rust/rust-snapshot.inc | |||
| @@ -15,11 +15,11 @@ SRC_URI[rustc-snapshot-aarch64.sha256sum] = "f26811e48d03c56c125de03d389e1ae7c6d | |||
| 15 | SRC_URI[cargo-snapshot-aarch64.sha256sum] = "6d11cd94618d80cda273eeeae7285980445f61a49ebacc616777b482a41cbf3f" | 15 | SRC_URI[cargo-snapshot-aarch64.sha256sum] = "6d11cd94618d80cda273eeeae7285980445f61a49ebacc616777b482a41cbf3f" |
| 16 | 16 | ||
| 17 | SRC_URI += " \ | 17 | SRC_URI += " \ |
| 18 | https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \ | 18 | https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ |
| 19 | https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \ | 19 | https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ |
| 20 | https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \ | 20 | https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ |
| 21 | " | 21 | " |
| 22 | 22 | ||
| 23 | RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu" | 23 | RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" |
| 24 | RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu" | 24 | RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" |
| 25 | CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu" | 25 | CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" |
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 1d6f99afad..f39228e3c0 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc | |||
| @@ -27,7 +27,7 @@ CARGO_DISABLE_BITBAKE_VENDORING = "1" | |||
| 27 | 27 | ||
| 28 | # We can't use RUST_BUILD_SYS here because that may be "musl" if | 28 | # We can't use RUST_BUILD_SYS here because that may be "musl" if |
| 29 | # TCLIBC="musl". Snapshots are always -unknown-linux-gnu | 29 | # TCLIBC="musl". Snapshots are always -unknown-linux-gnu |
| 30 | SNAPSHOT_BUILD_SYS = "${BUILD_ARCH}-unknown-linux-gnu" | 30 | SNAPSHOT_BUILD_SYS = "${RUST_BUILD_ARCH}-unknown-linux-gnu" |
| 31 | setup_cargo_environment () { | 31 | setup_cargo_environment () { |
| 32 | # The first step is to build bootstrap and some early stage tools, | 32 | # The first step is to build bootstrap and some early stage tools, |
| 33 | # these are build for the same target as the snapshot, e.g. | 33 | # these are build for the same target as the snapshot, e.g. |
