Commit a1625a24 authored by Freedesktop SDK Merge Bot's avatar Freedesktop SDK Merge Bot

Merge branch 'alatiera/rustc-tools' into '18.08'

Rust: build the external tools as part of the rustc build

See merge request !1193
parents 0105b81b 54ac5a82
Pipeline #61159090 passed with stages
in 45 minutes and 3 seconds
......@@ -4,8 +4,6 @@ depends:
- filename: bootstrap-import.bst
- filename: extensions/rust/rust.bst
type: build
- filename: extensions/rust/cargo.bst
type: build
- filename: desktop/vala.bst
type: build
- filename: desktop/gdk-pixbuf.bst
......
......@@ -9,5 +9,3 @@ variables:
depends:
- filename: extensions/rust/rust.bst
type: build
- filename: extensions/rust/cargo.bst
type: build
kind: manual
depends:
- filename: bootstrap-import.bst
type: build
config:
install-commands:
- |
bash install.sh \
--prefix="%{prefix}" \
--destdir="%{install-root}" \
--disable-ldconfig
sources:
- kind: tar
(?):
- target_arch == "x86_64":
url: https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.gz
ref: 9dd7f79a0ab882ed7c892731514a4aed6435f7bc8a20381a8346b471c8a14209
- target_arch == "i686":
url: https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.gz
ref: 163f46bd84ba6348dfe1ac3c10bc4730059f321791d2a7d4d4704fe8ddf8a755
- target_arch == "aarch64":
url: https://static.rust-lang.org/dist/cargo-0.33.0-aarch64-unknown-linux-gnu.tar.gz
ref: 92438fb49b4f4c434826fc3d07368c9df114bac2294daf2a3109c63d5e86038a
- target_arch == "arm":
url: https://static.rust-lang.org/dist/cargo-0.33.0-armv7-unknown-linux-gnueabihf.tar.gz
ref: d3fd97909f0c649e4c7d63bcdf368f54838400ed4dbd46862e66aca7b39aa85a
This diff is collapsed.
......@@ -50,11 +50,14 @@ config:
target = ["%{rust-target}"]
cargo = "/usr/bin/cargo"
rustc = "/usr/bin/rustc"
docs = true
submodules = false
python = "/usr/bin/python3"
locked-deps = true
vendor = true
verbose = 2
extended = true
tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src"]
[install]
prefix = "%{prefix}"
sysconfdir = "%{sysconfdir}"
......@@ -66,9 +69,12 @@ config:
mandir = "%{mandir}"
docdir = "%{datadir}/doc/rust"
[rust]
optimize = true
channel = "stable"
debuginfo = true
debuginfo-only-std = %{debuginfo-only-std}
debuginfo-tools = true
backtrace = true
rpath = false
default-linker = "/usr/bin/gcc"
[target.%{rust-target}]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment