mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-02-15 03:51:51 +00:00
47 lines
2.3 KiB
Diff
47 lines
2.3 KiB
Diff
From bd479113d38aa453cbad9d9f5ca9c5fc8903b0cf Mon Sep 17 00:00:00 2001
|
|
From: onur-ozkan <work@onurozkan.dev>
|
|
Date: Thu, 11 Apr 2024 14:57:10 +0300
|
|
Subject: [PATCH] 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`.
|
|
|
|
Signed-off-by: onur-ozkan <work@onurozkan.dev>
|
|
---
|
|
config.example.toml | 2 +-
|
|
src/bootstrap/configure.py | 4 +++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/config.example.toml
|
|
+++ b/config.example.toml
|
|
@@ -302,7 +302,7 @@
|
|
|
|
# Set the bootstrap/download cache path. It is useful when building rust
|
|
# repeatedly in a CI invironment.
|
|
-# bootstrap-cache-path = /shared/cache
|
|
+#bootstrap-cache-path = /path/to/shared/cache
|
|
|
|
# Enable a build of the extended Rust tool set which is not only the compiler
|
|
# but also tools such as Cargo. This will also produce "combined installers"
|
|
--- a/src/bootstrap/configure.py
|
|
+++ b/src/bootstrap/configure.py
|
|
@@ -152,9 +152,9 @@ v("default-linker", "rust.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_checki
|
|
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':
|