about summary refs log tree commit diff
path: root/src/bootstrap
AgeCommit message (Collapse)AuthorLines
2024-09-14Rollup merge of #130306 - onur-ozkan:avoid-submodule-updates-in-tests, r=KobzolStuart Cook-0/+2
avoid updating LLVM submodule during bootstrap unit tests To test this, make sure you don't have `src/llvm-project` fetched and then set `llvm.download-ci-llvm=true` and run `x test bootstrap`.
2024-09-14Rollup merge of #130302 - onur-ozkan:130040-with-fixes, r=KobzolStuart Cook-39/+47
add llvm-bitcode-linker and llvm-tools bins to ci-rustc's sysroot https://github.com/rust-lang/rust/pull/130040 is [reverted](https://github.com/rust-lang/rust/pull/130292) because adding component binaries directly to the dist tarball of the compiler caused conflicts (see https://github.com/rust-lang/rust/issues/130291 and https://github.com/rust-lang/rustup/issues/4019). This PR solves the original problem without touching the dist tarball. r? Kobzol
2024-09-14Rollup merge of #130138 - Zalathar:initial-libdir, r=albertlarsan68Stuart Cook-4/+8
bootstrap: Print more debug info when `find_initial_libdir` fails From looking at the failure messages printed by #129775, my hypothesis is that `rustc --print=sysroot` sometimes prints the wrong path when the rustc executable is hardlinked in multiple places, at least on my macOS system. However, currently I don't have any concrete evidence of this actually happening. This PR therefore expands on #129775 by printing even more information on failure (including the actual rustc path), in the hope that when the failure next occurs we can confirm or reject the hypothesis that `rustc --print=sysroot` is printing the wrong path.
2024-09-14Auto merge of #125419 - GuillaumeGomez:add-gcc-to-dist, r=Kobzolbors-41/+187
[bootstrap] Add support for building gcc and libgccjit As `@eholk` summarized below: > From my understanding, this change would add libgccjit as an optional component to the Rust distribution. This library is licensed under GPLv2 and currently we do not have any other components under that license so it would be a new license, and one that is generally more restrictive than the other licenses we use. It'll greatly improve the experience for anyone wanting to work on the GCC backend from the compiler. Should help with https://github.com/rust-lang/rust/issues/124172. Will unblock #124353. r? `@Kobzol`
2024-09-13Auto merge of #130121 - lolbinarycat:bootstrap-warn-old-upstream-worktree, ↵bors-9/+1
r=albertlarsan68 bootstrap: handle worktrees in warn_old_master_branch fixes #130111
2024-09-13avoid updating LLVM submodule during bootstrap unit testsonur-ozkan-0/+2
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-13Remove gcc changes for dist buildGuillaume Gomez-12/+0
2024-09-13Rollup merge of #130261 - onur-ozkan:#130242, r=KobzolStuart Cook-1/+2
skip target sanity check when it's a `local-rebuild` Running the stage0 target sanity check on the newly built compiler can result in errors and incorrect assumptions. Resolves #130242
2024-09-13add llvm-bitcode-linker and llvm-tools bins to ci-rustc's sysrootonur-ozkan-39/+47
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-12Revert "Auto merge of #130040 - onur-ozkan:llvm-tools-with-ci-rustc, r=Kobzol"Eric Huss-121/+50
This reverts commit adaff5368b0c7b328a0320a218751d65ab1bba97, reversing changes made to 2e8db5e9e39c2bf7729113b3041ef4011d90ac5a.
2024-09-12Auto merge of #130040 - onur-ozkan:llvm-tools-with-ci-rustc, r=Kobzolbors-50/+121
unify `llvm-bitcode-linker`, `wasm-component-ld` and llvm-tools logics To use the precompiled `ci-rustc` in CI, we need to install `llvm-bitcode-linker` and LLVM tools into ci-rustc's sysroot. Without them some CI pipelines may fail, as shown [here](https://github.com/rust-lang/rust/pull/122709#issuecomment-2334365988). Blocker for https://github.com/rust-lang/rust/pull/122709
2024-09-12skip target sanity check when it's a `local-rebuild`onur-ozkan-1/+2
Running the stage0 target sanity check on the newly built compiler can result in errors and incorrect assumptions. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-11unify `llvm-bitcode-linker`, `wasm-component-ld` and llvm-tools logicsonur-ozkan-50/+121
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-11Rollup merge of #130161 - onur-ozkan:fmt-changed-files, r=Kobzol,RalfJungMatthias Krüger-53/+23
refactor merge base logic and fix `x fmt` When remote upstream is not configured, using [get_git_modified_files](https://github.com/rust-lang/rust/blob/38e3a5771cefc9362976a605549f8b04d5707311/src/tools/build_helper/src/git.rs#L114) to find modified files fails because [get_rust_lang_rust_remote](https://github.com/rust-lang/rust/blob/38e3a5771cefc9362976a605549f8b04d5707311/src/tools/build_helper/src/git.rs#L46-L48) can not resolve "rust-lang/rust" from the git output. The changes in this PR makes bootstrap to find the latest bors commit, treating it as the "closest upstream commit" so that the change tracker logic can use it to find the diffs. In addition, [skips formatting](https://github.com/rust-lang/rust/commit/e3924544832668a6e239153a90d3be2077fbdce4) if there are no modified files. Fixes #130147
2024-09-10skip formatting if no files have been modifiedonur-ozkan-0/+5
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-10handle `GitConfig` for `tools/compiletest`onur-ozkan-0/+1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-10add change entry for "tools" and "library" profile updateonur-ozkan-0/+5
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-10force ci-llvm by default on library and tools profilesonur-ozkan-2/+4
It's very rare for developers to need to modify LLVM, so "if-unchanged" isn't a good default since it fetches the LLVM submodule to track changes. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-10Rollup merge of #130143 - RalfJung:miri-test-libstd, r=compiler-errorsMatthias Krüger-2/+6
miri-test-libstd: add missing BOOTSTRAP_ARGS Note sure if BOOTSTRAP_ARGS will make any difference here, but all the other x.py invocations have it and I did not *deliberately* leave it away when I added these, so... probably best to add them? Also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it.
2024-09-10bootstrap: Print more debug info when `find_initial_libdir` failsZalathar-4/+8
2024-09-09Rollup merge of #130162 - onur-ozkan:bump-ci-llvm-stamp, r=KobzolJubilee-1/+1
bump download-ci-llvm-stamp This should trigger the download and extraction of the ci-llvm tarball, which should resolve https://github.com/rust-lang/rust/issues/130144.
2024-09-09Rollup merge of #129473 - Urgau:fix-llvm-if-unchanged, r=onur-ozkanJubilee-2/+9
use `download-ci-llvm=true` in the default compiler config https://github.com/rust-lang/rust/commit/1ca2708e77ac735adc3824501667694b4f9c1303 made it so that the `src/llvm-project` submodule has to be checkout for `download-ci-llvm = "if-unchanged"` to know if the submodule has been changed, but that is not required, if the submodule hasn't been checkout it cannot have been modified. ~~This PR restore the previous behavior by only updating the submodule if it has already been checkout.~~ This PR makes `download-ci-llvm = true` check if CI llvm is available and make it the default for the compiler profile, as to prevent unnecessarily checking out `src/llvm-project` with `"if-unchanged"`. r? `````@onur-ozkan`````
2024-09-09Auto merge of #130165 - matthiaskrgr:rollup-fsnmz3t, r=matthiaskrgrbors-0/+27
Rollup of 9 pull requests Successful merges: - #129929 (`rustc_mir_transform` cleanups, round 2) - #130022 (Dataflow/borrowck lifetime cleanups) - #130064 (fix ICE in CMSE type validation) - #130067 (Remove redundant check in `symlink_hard_link` test) - #130131 (Print a helpful message if any tests were skipped for being up-to-date) - #130137 (Fix ICE caused by missing span in a region error) - #130153 (use verbose flag as a default value for `rust.verbose-tests`) - #130154 (Stabilize `char::MIN`) - #130158 (Update books) r? `@ghost` `@rustbot` modify labels: rollup
2024-09-09Rollup merge of #130153 - onur-ozkan:verbose-to-verbose-tests, r=KobzolMatthias Krüger-0/+12
use verbose flag as a default value for `rust.verbose-tests` See the [Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Run.20tests.20in.20x.2Epy.20with.20.22pretty.22.20test.20rendering.3F) for more context.
2024-09-09Rollup merge of #130131 - Zalathar:up-to-date, r=KobzolMatthias Krüger-0/+15
Print a helpful message if any tests were skipped for being up-to-date When running tests without the `--force-rerun` flag, compiletest will automatically skip any tests that (in its judgement) don't need to be run again since the last time they were run. This is normally very useful, but can occasionally be confusing, especially in edge-cases where up-to-date checking is not completely accurate (or the test is flaky). This PR makes bootstrap count the number of tests that were ignored for being up-to-date (via a hard-coded check on the ignore reason), and prints a helpful message when that number is nonzero. --- Sample output: ```text test result: ok. 4 passed; 0 failed; 17578 ignored; 0 measured; 0 filtered out; finished in 463.79ms help: ignored 17295 up-to-date tests; use `--force-rerun` to prevent this Build completed successfully in 0:00:07 ```
2024-09-09handle `GitConfig` for `tools/suggest-tests`onur-ozkan-0/+1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-09bump download-ci-llvm-stamponur-ozkan-1/+1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-09replace `get_closest_merge_base_commit` with `get_closest_merge_commit`onur-ozkan-53/+15
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-09add `git_merge_commit_email` into `GitConfig`onur-ozkan-0/+1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-09Auto merge of #128939 - bjorn3:windows_cg_clif_component, r=albertlarsan68bors-12/+3
Distribute rustc_codegen_cranelift for Windows With support for raw-dylib recently added to cg_clif, and inline assembly support working on Windows for quite a while now, all blockers for distributing cg_clif on Windows that I mentioned in https://github.com/rust-lang/rust/pull/81746#issuecomment-1774099637 are fixed now.
2024-09-09use verbose flag as a default value for `rust.verbose-tests`onur-ozkan-0/+12
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-09Auto merge of #130135 - Kobzol:bootstrap-check-linker, r=onur-ozkanbors-3/+3
Do not skip linker configuration for `check` builds This essentially reverts a part of https://github.com/rust-lang/rust/pull/128871, to fix https://github.com/rust-lang/rust/issues/130108. This is mostly a hotfix until we can figure out a better way to both avoid rebuilds and avoid configuring the linker for `x check`. Skipping linker for check builds was causing unexpected rebuilds. Fixes: https://github.com/rust-lang/rust/issues/130108
2024-09-09bootstrap/Makefile.in: miri: add missing BOOTSTRAP ARGSRalf Jung-2/+6
also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it
2024-09-09Auto merge of #130133 - workingjubilee:rollup-t5o827k, r=workingjubileebors-42/+17
Rollup of 14 pull requests Successful merges: - #119229 (Update mingw-w64 + GNU toolchain) - #128345 (added support for GNU/Hurd on x86_64) - #128667 (rustdoc: normalise type/field names) - #129876 (Use sysroot crates maximally in `rustc_codegen_gcc`.) - #130034 ( Fix enabling wasm-component-ld to match other tools ) - #130048 (run-make-support: Add llvm-pdbutil) - #130068 (Test codegen when setting deployment target) - #130070 (Rename variant `AddrOfRegion` of `RegionVariableOrigin` to `BorrowRegion`) - #130087 (remove 'const' from 'Option::iter') - #130090 (make Result::copied unstably const) - #130092 (Fixes typo in wasm32-wasip2 doc comment) - #130107 (const: make ptr.is_null() stop execution on ambiguity) - #130115 (Remove needless returns detected by clippy in libraries) - #130130 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2024-09-09Do not skip linker configuration for `check` buildsJakub Beránek-3/+3
It was causing unexpected rebuilds.
2024-09-09Rollup merge of #130034 - alexcrichton:fix-some-wasm-component-ld-comments, ↵Jubilee-42/+17
r=onur-ozkan Fix enabling wasm-component-ld to match other tools It was [pointed out recently][comment] that enabling `wasm-component-ld` as a host tool is different from other host tools. This commit refactors the logic to match by deduplicating selection of when to build other tools and then using the same logic for `wasm-component-ld`. While here I also fixed a typo pointed out in https://github.com/rust-lang/rust/pull/126967#pullrequestreview-2285267534 [comment]: https://github.com/rust-lang/rust/pull/127866#issuecomment-2333434720
2024-09-09Print a helpful message if any tests were skipped for being up-to-dateZalathar-0/+15
2024-09-08bootstrap: handle worktrees in warn_old_master_branchbinarycat-9/+1
fixes #130111
2024-09-08handle dry-run mode in `Config::get_builder_toml`onur-ozkan-0/+4
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-08use `Config::get_builder_toml` for ci-rustc config parsingonur-ozkan-5/+3
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-08fix llvm ThinLTO behaviouronur-ozkan-2/+1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-08print incompatible options even if we don't downloadonur-ozkan-21/+20
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-08remove `check_ci_llvm` usageonur-ozkan-24/+0
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-08detect incompatible CI LLVM options more preciselyonur-ozkan-3/+140
Previously, the logic here was simply checking whether the option was set in `config.toml`. This approach was not manageable in our CI runners as we set so many options in config.toml. In reality, those values are not incompatible since they are usually the same value used to generate the CI llvm. Now, the new logic compares the configuration values with the values used to generate the CI llvm, so we get more precise results and make the process more manageable. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-09-07Rollup merge of #130059 - gurry:130039-remove-skip-rebuild, r=KobzolMatthias Krüger-3/+0
Remove the unused `llvm-skip-rebuild` option from x.py Fixes #130039
2024-09-07Rollup merge of #129594 - lolbinarycat:explain-curl-options, r=albertlarsan68Matthias Krüger-14/+38
explain the options bootstrap passes to curl also fixes a discrepancy where the rust side doesn't use -L docs are only on the rust side, since duplicated prose has a tendancy to get out-of-sync, and also because there are talks of removing the python script all together eventually.
2024-09-07Auto merge of #128871 - onur-ozkan:128180, r=Kobzolbors-10/+32
bypass linker configuration and cross target check for specific commands Avoids configuring the linker and checking cross-target-specific tools unless necessary. Resolves #128180 cc `@ChrisDenton`
2024-09-07Remove unused option from x.pyGurinder Singh-3/+0
2024-09-06Fix enabling wasm-component-ld to match other toolsAlex Crichton-42/+17
It was [pointed out recently][comment] that enabling `wasm-component-ld` as a host tool is different from other host tools. This commit refactors the logic to match by deduplicating selection of when to build other tools and then using the same logic for `wasm-component-ld`. [comment]: https://github.com/rust-lang/rust/pull/127866#issuecomment-2333434720
2024-09-06Make `download-ci-llvm = true` check if CI llvm is availableUrgau-2/+9
and make it the default for the compiler profile, as to prevent unnecessarily checking out `src/llvm-project` with `"if-unchanged"`.
generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-03-01 09:16:06 +0000