diff options
| author |   Randy MacLeod <randy.macleod@windriver.com> | 2021-09-05 21:26:48 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-07 21:52:04 +0100 |
| commit | e56c4e0dca3ca6187271031d4f30c76a42879639 (patch) | |
| tree | 52de7c5f3dd0089c3324c6aa7a1f6a18b2fd352c | |
| parent | 5ace3ada5c54500c71becc8e0c6eddeb8bc053e3 (diff) | |
| download | openembedded-core-e56c4e0dca3ca6187271031d4f30c76a42879639.tar.gz | |
tcmode-default: add rust to the default toolchains
Remove the rust_versions.inc file and put it's content
in tcmode-default.inc is done for other toolchains.
Rename RUST_VERSION to RUSTVERSION to adhere to the
naming format used for other languages.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/distro/include/rust_versions.inc | 13 | ||||
| -rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/conf/distro/include/rust_versions.inc b/meta/conf/distro/include/rust_versions.inc deleted file mode 100644 index a11ba22a8f..0000000000 --- a/meta/conf/distro/include/rust_versions.inc +++ /dev/null @@ -1,13 +0,0 @@ -# include this in your distribution to easily switch between versions -# just by changing RUST_VERSION variable - -RUST_VERSION ?= "1.51.0" - -PREFERRED_VERSION_cargo ?= "${RUST_VERSION}" -PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}" -PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}" -PREFERRED_VERSION_rust ?= "${RUST_VERSION}" -PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}" -PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}" -PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}" -PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 47f23f5c39..80b03305bb 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -27,6 +27,7 @@ GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump LLVMVERSION ?= "12.0.1" +RUSTVERSION ?= "1.54.0" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" @@ -81,3 +82,15 @@ PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}" PREFERRED_VERSION_llvm = "${LLVMVERSION}" PREFERRED_VERSION_llvm-native = "${LLVMVERSION}" PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}" + +# Rust toolchain preferred versions: + +PREFERRED_VERSION_cargo ?= "${RUSTVERSION}" +PREFERRED_VERSION_cargo-native ?= "${RUSTVERSION}" +PREFERRED_VERSION_libstd-rs ?= "${RUSTVERSION}" +PREFERRED_VERSION_rust ?= "${RUSTVERSION}" +PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUSTVERSION}" +PREFERRED_VERSION_rust-llvm ?= "${RUSTVERSION}" +PREFERRED_VERSION_rust-llvm-native ?= "${RUSTVERSION}" +PREFERRED_VERSION_rust-native ?= "${RUSTVERSION}" + |