nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle fast-submodules option correctly

Browse Source 
This option was introduced in 72cb109bec, but it uses two different
spellings (fast-submodule vs fast-submodules) and isn't handled by
Rust bootstrap which means that any attempt to set this flag fails.
This commit is contained in:
Petr Hosek 2018-03-30 16:42:57 -07:00
parent 80785a547d
commit a24811e15a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/bootstrap.py
View File

@ -647,7 +647,7 @@ class RustBuild(object):
if (not os.path.exists(os.path.join(self.rust_root, ".git"))) or \ if (not os.path.exists(os.path.join(self.rust_root, ".git"))) or \
self.get_toml('submodules') == "false": self.get_toml('submodules') == "false":
return return
slow_submodules = self.get_toml('fast-submodule') == "false" slow_submodules = self.get_toml('fast-submodules') == "false"
start_time = time() start_time = time()
if slow_submodules: if slow_submodules:
print('Unconditionally updating all submodules') print('Unconditionally updating all submodules')

4
src/bootstrap/config.rs
View File

@ -45,6 +45,7 @@ pub struct Config {
pub ninja: bool, pub ninja: bool,
pub verbose: usize, pub verbose: usize,
pub submodules: bool, pub submodules: bool,
pub fast_submodules: bool,
pub compiler_docs: bool, pub compiler_docs: bool,
pub docs: bool, pub docs: bool,
pub locked_deps: bool, pub locked_deps: bool,
@ -191,6 +192,7 @@ struct Build {
compiler_docs: Option<bool>, compiler_docs: Option<bool>,
docs: Option<bool>, docs: Option<bool>,
submodules: Option<bool>, submodules: Option<bool>,
fast_submodules: Option<bool>,
gdb: Option<String>, gdb: Option<String>,
locked_deps: Option<bool>, locked_deps: Option<bool>,
vendor: Option<bool>, vendor: Option<bool>,
@ -328,6 +330,7 @@ impl Config {
config.rust_optimize = true; config.rust_optimize = true;
config.rust_optimize_tests = true; config.rust_optimize_tests = true;
config.submodules = true; config.submodules = true;
config.fast_submodules = true;
config.docs = true; config.docs = true;
config.rust_rpath = true; config.rust_rpath = true;
config.channel = "dev".to_string(); config.channel = "dev".to_string();
@ -404,6 +407,7 @@ impl Config {
set(&mut config.compiler_docs, build.compiler_docs); set(&mut config.compiler_docs, build.compiler_docs);
set(&mut config.docs, build.docs); set(&mut config.docs, build.docs);
set(&mut config.submodules, build.submodules); set(&mut config.submodules, build.submodules);
set(&mut config.fast_submodules, build.fast_submodules);
set(&mut config.locked_deps, build.locked_deps); set(&mut config.locked_deps, build.locked_deps);
set(&mut config.vendor, build.vendor); set(&mut config.vendor, build.vendor);
set(&mut config.full_bootstrap, build.full_bootstrap); set(&mut config.full_bootstrap, build.full_bootstrap);