From 365a139716436bed8e6a178f4539e4a3d31099c4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 27 Nov 2017 18:02:53 +0100 Subject: Use rustup.rs instead of custom bootstrap Fixes #11361, closes #18874 --- servobuild.example | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'servobuild.example') diff --git a/servobuild.example b/servobuild.example index b7cdcc7ba7d..98dd8edaf9c 100644 --- a/servobuild.example +++ b/servobuild.example @@ -6,22 +6,11 @@ # Tool options [tools] -# Where Rust compiler and other downloads will be stored. Can be -# shared by multiple Servo repositories. Defaults to /.servo -cache-dir = "./.servo" - -# Where Cargo stores all of its clones Defaults to /.cargo -cargo-home-dir = "./.cargo" - -# If system-rust is true, will use rustc/rustdoc from the path, or if -# rust-root is specified, will make sure that rust-root is in the path -# when building. Similarly for Cargo. This takes care of PATH as well as -# [DY]LD_LIBRARY_PATH. -# rust-root and cargo-root default to / -system-rust = false -#rust-root = "/path/to/rust" -system-cargo = false -#cargo-root = "/path/to/cargo" +# If use-rustup is set to false, mach will run for example "cargo build" +# instead of "rustup run --install cargo build" +# It is then the user’s responsibility to ensure that cargo and especially rustc +# in $PATH are versions compatible with Servo. +use-rustup = true # If rustc-with-gold is true, will try to find and use gold linker with rustc. # Defaults to true -- cgit v1.2.3