Rollup merge of #110429 - jsoref:spelling-src-bootstrap, r=albertlarsan68
Spelling src bootstrap The various src/* items seem slightly disparate, so I'm doing src/* individually. split from #110392
This commit is contained in:
commit
af92c6a0a3
6 changed files with 6 additions and 6 deletions
|
@ -575,7 +575,7 @@ class RustBuild(object):
|
||||||
]
|
]
|
||||||
patchelf_args = ["--set-rpath", ":".join(rpath_entries)]
|
patchelf_args = ["--set-rpath", ":".join(rpath_entries)]
|
||||||
if not fname.endswith(".so"):
|
if not fname.endswith(".so"):
|
||||||
# Finally, set the corret .interp for binaries
|
# Finally, set the correct .interp for binaries
|
||||||
with open("{}/nix-support/dynamic-linker".format(nix_deps_dir)) as dynamic_linker:
|
with open("{}/nix-support/dynamic-linker".format(nix_deps_dir)) as dynamic_linker:
|
||||||
patchelf_args += ["--set-interpreter", dynamic_linker.read().rstrip()]
|
patchelf_args += ["--set-interpreter", dynamic_linker.read().rstrip()]
|
||||||
|
|
||||||
|
|
|
@ -1399,7 +1399,7 @@ impl<'a> Builder<'a> {
|
||||||
|
|
||||||
// Add extra cfg not defined in/by rustc
|
// Add extra cfg not defined in/by rustc
|
||||||
//
|
//
|
||||||
// Note: Altrough it would seems that "-Zunstable-options" to `rustflags` is useless as
|
// Note: Although it would seems that "-Zunstable-options" to `rustflags` is useless as
|
||||||
// cargo would implicitly add it, it was discover that sometimes bootstrap only use
|
// cargo would implicitly add it, it was discover that sometimes bootstrap only use
|
||||||
// `rustflags` without `cargo` making it required.
|
// `rustflags` without `cargo` making it required.
|
||||||
rustflags.arg("-Zunstable-options");
|
rustflags.arg("-Zunstable-options");
|
||||||
|
|
|
@ -22,7 +22,7 @@ pub enum GitInfo {
|
||||||
/// If the info should be used (`omit_git_hash` is false), this will be
|
/// If the info should be used (`omit_git_hash` is false), this will be
|
||||||
/// `Some`, otherwise it will be `None`.
|
/// `Some`, otherwise it will be `None`.
|
||||||
Present(Option<Info>),
|
Present(Option<Info>),
|
||||||
/// This is not a git repostory, but the info can be fetched from the
|
/// This is not a git repository, but the info can be fetched from the
|
||||||
/// `git-commit-info` file.
|
/// `git-commit-info` file.
|
||||||
RecordedForTarball(Info),
|
RecordedForTarball(Info),
|
||||||
}
|
}
|
||||||
|
|
|
@ -1153,7 +1153,7 @@ impl Step for Libunwind {
|
||||||
run.builder.ensure(Libunwind { target: run.target });
|
run.builder.ensure(Libunwind { target: run.target });
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Build linunwind.a
|
/// Build libunwind.a
|
||||||
fn run(self, builder: &Builder<'_>) -> Self::Output {
|
fn run(self, builder: &Builder<'_>) -> Self::Output {
|
||||||
builder.update_submodule(&Path::new("src/llvm-project"));
|
builder.update_submodule(&Path::new("src/llvm-project"));
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
//! This module renders the JSON output of libtest into a human-readable form, trying to be as
|
//! This module renders the JSON output of libtest into a human-readable form, trying to be as
|
||||||
//! similar to libtest's native output as possible.
|
//! similar to libtest's native output as possible.
|
||||||
//!
|
//!
|
||||||
//! This is needed because we need to use libtest in JSON mode to extract granluar information
|
//! This is needed because we need to use libtest in JSON mode to extract granular information
|
||||||
//! about the executed tests. Doing so suppresses the human-readable output, and (compared to Cargo
|
//! about the executed tests. Doing so suppresses the human-readable output, and (compared to Cargo
|
||||||
//! and rustc) libtest doesn't include the rendered human-readable output as a JSON field. We had
|
//! and rustc) libtest doesn't include the rendered human-readable output as a JSON field. We had
|
||||||
//! to reimplement all the rendering logic in this module because of that.
|
//! to reimplement all the rendering logic in this module because of that.
|
||||||
|
|
|
@ -100,7 +100,7 @@ pub fn check(build: &mut Build) {
|
||||||
Couldn't find required command: cmake
|
Couldn't find required command: cmake
|
||||||
|
|
||||||
You should install cmake, or set `download-ci-llvm = true` in the
|
You should install cmake, or set `download-ci-llvm = true` in the
|
||||||
`[llvm]` section section of `config.toml` to download LLVM rather
|
`[llvm]` section of `config.toml` to download LLVM rather
|
||||||
than building it.
|
than building it.
|
||||||
"
|
"
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue