Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(opt-dist): respect existing config.toml #125473

Merged
merged 1 commit into from
May 26, 2024
Merged

fix(opt-dist): respect existing config.toml #125473

merged 1 commit into from
May 26, 2024

Commits on May 26, 2024

  1. opt-dist: dont overrwite config.toml when verifying 

    This is another step toward making opt-dist work in sandboxed environments

opt-dist verifies the final built rustc against a subset of rustc test
suite. However it overwrote the pre-existing `config.toml` [^1],
and that results in ./vendor/ directory removed [^2].

Instead of overwriting, this patch use `--set <config-value>` to
override paths to rustc / cargo / llvm-config.

[^1]: https:/rust-lang/rust/blob/606afbb617a2949a4e35c4b0258ff94c980b9451/src/tools/opt-dist/src/tests.rs#L62-L77
[^2]: https:/rust-lang/rust/blob/8679004993f08807289911d9f400f4ac4391d2bc/src/bootstrap/bootstrap.py#L1057
    @weihanglo
    weihanglo committed May 26, 2024
    Configuration menu
    Copy the full SHA
    c81a40b View commit details
    Browse the repository at this point in the history