Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c24e1c3
add s390x z17 target features
folkertdev May 19, 2025
fab206b
make `OsString::new` and `PathBuf::new` unstably const
cyrgani May 24, 2025
0cba7fb
Remove `i128` and `u128` from `improper_ctypes_definitions`
tgross35 Feb 20, 2025
0f1579b
build dist for x86_64-pc-solaris and sparcv9-sun-solaris
psumbera Mar 4, 2025
23d5231
Use non-2015 edition paths in tests that do not test for their resolu…
Veykril Jun 2, 2025
252ad18
Improve the documentation of `Display` and `FromStr`, and their inter…
joshtriplett Feb 7, 2025
f412d05
Add some more description of interactions between `Display` and `From…
joshtriplett Feb 7, 2025
7ba5d26
`FromStr`: Rework explanation of `FromStr`/`Display` round-tripping
joshtriplett Jun 3, 2025
742014e
`Display`: Rework explanation of `FromStr`/`Display` round-tripping
joshtriplett Jun 3, 2025
a0c19ee
index: add method for checking range on DenseBitSet
nia-e May 31, 2025
556c096
bootstrap: don't symlink source dir into stage0 sysroot
lambdageek Jun 4, 2025
3e7d5aa
Rollup merge of #136687 - joshtriplett:improve-display-and-fromstr-do…
matthiaskrgr Jun 4, 2025
c5efc6a
Rollup merge of #137306 - tgross35:remove-i128-u128-improper-ctypes, …
matthiaskrgr Jun 4, 2025
8ae7ca0
Rollup merge of #138699 - psumbera:solaris-ci-build3, r=marcoieni
matthiaskrgr Jun 4, 2025
59bdb5c
Rollup merge of #141250 - folkertdev:s390x-z17-target-features, r=wor…
matthiaskrgr Jun 4, 2025
88620b4
Rollup merge of #141467 - cyrgani:const-empty-stringlikes, r=Amanieu
matthiaskrgr Jun 4, 2025
e63e53a
Rollup merge of #141871 - nia-e:fix-bitset, r=eholk
matthiaskrgr Jun 4, 2025
add4bde
Rollup merge of #141888 - ferrocene:lw/decouple-tests-from-2015, r=co…
matthiaskrgr Jun 4, 2025
d31faac
Rollup merge of #142000 - lambdageek:no-symlink-stage0, r=onur-ozkan
matthiaskrgr Jun 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bootstrap: don't symlink source dir into stage0 sysroot
In StdLink::run we subsequently recursively copy the initial sysroot
lib directory into the stage0-sysroot lib directory.  If the initial
sysroot is a toolchain that includes the `rust-src` component (in
lib/rustlib/src/rust), if we add this symlink, that recursive copy
will overwrite the repo sources with the toolchain's sources.
  • Loading branch information
lambdageek committed Jun 4, 2025
commit 556c0962edd7655f1532bc82d8a8287bf14950e9
30 changes: 17 additions & 13 deletions src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1878,23 +1878,27 @@ impl Step for Sysroot {
// so that any tools relying on `rust-src` also work for local builds,
// and also for translating the virtual `/rustc/$hash` back to the real
// directory (for running tests with `rust.remap-debuginfo = true`).
let sysroot_lib_rustlib_src = sysroot.join("lib/rustlib/src");
t!(fs::create_dir_all(&sysroot_lib_rustlib_src));
let sysroot_lib_rustlib_src_rust = sysroot_lib_rustlib_src.join("rust");
if let Err(e) = symlink_dir(&builder.config, &builder.src, &sysroot_lib_rustlib_src_rust) {
eprintln!(
"ERROR: creating symbolic link `{}` to `{}` failed with {}",
sysroot_lib_rustlib_src_rust.display(),
builder.src.display(),
e,
);
if builder.config.rust_remap_debuginfo {
if compiler.stage != 0 {
let sysroot_lib_rustlib_src = sysroot.join("lib/rustlib/src");
t!(fs::create_dir_all(&sysroot_lib_rustlib_src));
let sysroot_lib_rustlib_src_rust = sysroot_lib_rustlib_src.join("rust");
if let Err(e) =
symlink_dir(&builder.config, &builder.src, &sysroot_lib_rustlib_src_rust)
{
eprintln!(
"ERROR: some `tests/ui` tests will fail when lacking `{}`",
"ERROR: creating symbolic link `{}` to `{}` failed with {}",
sysroot_lib_rustlib_src_rust.display(),
builder.src.display(),
e,
);
if builder.config.rust_remap_debuginfo {
eprintln!(
"ERROR: some `tests/ui` tests will fail when lacking `{}`",
sysroot_lib_rustlib_src_rust.display(),
);
}
build_helper::exit!(1);
}
build_helper::exit!(1);
}

// rustc-src component is already part of CI rustc's sysroot
Expand Down
Loading