Skip to content

Commit 1620f33

Browse files
authored
Rollup merge of #123790 - onur-ozkan:invalid-config-option, r=clubby789
correct the handling of `bootstrap-cache-path` option This change makes `build.bootstrap-cache-path` option to be configurable with `./configure` script, so it can be used like `./configure --bootstrap-cache-path=demo`.
2 parents 8c13ff7 + bd47911 commit 1620f33

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: config.example.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302

303303
# Set the bootstrap/download cache path. It is useful when building rust
304304
# repeatedly in a CI invironment.
305-
# bootstrap-cache-path = /shared/cache
305+
#bootstrap-cache-path = /path/to/shared/cache
306306

307307
# Enable a build of the extended Rust tool set which is not only the compiler
308308
# but also tools such as Cargo. This will also produce "combined installers"

Diff for: src/bootstrap/configure.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ def v(*args):
152152
# (others are conditionally saved).
153153
o("manage-submodules", "build.submodules", "let the build manage the git submodules")
154154
o("full-bootstrap", "build.full-bootstrap", "build three compilers instead of two (not recommended except for testing reproducible builds)")
155-
o("bootstrap-cache-path", "build.bootstrap-cache-path", "use provided path for the bootstrap cache")
156155
o("extended", "build.extended", "build an extended rust tool set")
157156

157+
v("bootstrap-cache-path", None, "use provided path for the bootstrap cache")
158158
v("tools", None, "List of extended tools will be installed")
159159
v("codegen-backends", None, "List of codegen backends to build")
160160
v("build", "build.build", "GNUs ./configure syntax LLVM build triple")
@@ -359,6 +359,8 @@ def apply_args(known_args, option_checking, config):
359359
set('target.{}.llvm-filecheck'.format(build_triple), value, config)
360360
elif option.name == 'tools':
361361
set('build.tools', value.split(','), config)
362+
elif option.name == 'bootstrap-cache-path':
363+
set('build.bootstrap-cache-path', value, config)
362364
elif option.name == 'codegen-backends':
363365
set('rust.codegen-backends', value.split(','), config)
364366
elif option.name == 'host':

0 commit comments

Comments
 (0)