diff options
| author | bors <bors@rust-lang.org> | 2024-04-11 15:46:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-11 15:46:42 +0000 |
| commit | df7daa815f4047a1cfe24ecfbc12cfd4f40fa928 (patch) | |
| tree | bb5a109cb3448f72eda68a555aeba02103bd7962 /src | |
| parent | 72fe8a0f0049873f4b1d0ab3c482170921819106 (diff) | |
| parent | 1620f336793f61ba558c3b2438ff936c7f3b3d46 (diff) | |
| download | rust-df7daa815f4047a1cfe24ecfbc12cfd4f40fa928.tar.gz rust-df7daa815f4047a1cfe24ecfbc12cfd4f40fa928.zip | |
Auto merge of #123795 - matthiaskrgr:rollup-deesd9c, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #123660 (Make the computation of `coroutine_captures_by_ref_ty` more sophisticated) - #123738 (Call lower_const_param instead of duplicating the code) - #123774 (Fix typo MaybeUnit -> MaybeUninit) - #123790 (correct the handling of `bootstrap-cache-path` option) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rwxr-xr-x | src/bootstrap/configure.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index 818a7daadca..768aac912ce 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -152,9 +152,9 @@ v("default-linker", "rust.default-linker", "the default linker") # (others are conditionally saved). o("manage-submodules", "build.submodules", "let the build manage the git submodules") o("full-bootstrap", "build.full-bootstrap", "build three compilers instead of two (not recommended except for testing reproducible builds)") -o("bootstrap-cache-path", "build.bootstrap-cache-path", "use provided path for the bootstrap cache") o("extended", "build.extended", "build an extended rust tool set") +v("bootstrap-cache-path", None, "use provided path for the bootstrap cache") v("tools", None, "List of extended tools will be installed") v("codegen-backends", None, "List of codegen backends to build") v("build", "build.build", "GNUs ./configure syntax LLVM build triple") @@ -359,6 +359,8 @@ def apply_args(known_args, option_checking, config): set('target.{}.llvm-filecheck'.format(build_triple), value, config) elif option.name == 'tools': set('build.tools', value.split(','), config) + elif option.name == 'bootstrap-cache-path': + set('build.bootstrap-cache-path', value, config) elif option.name == 'codegen-backends': set('rust.codegen-backends', value.split(','), config) elif option.name == 'host': |
