diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-11-27 18:02:53 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-01-10 18:05:44 +0100 |
| commit | 365a139716436bed8e6a178f4539e4a3d31099c4 (patch) | |
| tree | 5cf0a6c5dbd499607519258ebf1ab99ddd66406d /servobuild.example | |
| parent | 6dff251e35736fa74eaab6ddbc8b6ecec08ecf48 (diff) | |
| download | servo-365a139716436bed8e6a178f4539e4a3d31099c4.tar.gz servo-365a139716436bed8e6a178f4539e4a3d31099c4.zip | |
Use rustup.rs instead of custom bootstrap
Fixes #11361, closes #18874
Diffstat (limited to 'servobuild.example')
| -rw-r--r-- | servobuild.example | 21 |
1 files changed, 5 insertions, 16 deletions
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-repo>/.servo -cache-dir = "./.servo" - -# Where Cargo stores all of its clones Defaults to <servo-repo>/.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 <servo-repo>/ -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 <toolchain> 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 |