Rollup merge of #92182 - nnethercote:label-more-build-steps, r=Mark-Simulacrum

Label more build steps

Some small improvements.

r? ```@Mark-Simulacrum```
This commit is contained in:
Matthias Krüger 2022-01-05 11:26:03 +01:00 committed by GitHub
commit e35a4bd8d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 24 deletions

View file

@ -974,6 +974,7 @@ class RustBuild(object):
def build_bootstrap(self):
"""Build bootstrap"""
print("Building rustbuild")
build_dir = os.path.join(self.build_dir, "bootstrap")
if self.clean and os.path.exists(build_dir):
shutil.rmtree(build_dir)
@ -1133,7 +1134,7 @@ class RustBuild(object):
recorded_submodules[data[3]] = data[2]
for module in filtered_submodules:
self.update_submodule(module[0], module[1], recorded_submodules)
print("Submodules updated in %.2f seconds" % (time() - start_time))
print(" Submodules updated in %.2f seconds" % (time() - start_time))
def set_dist_environment(self, url):
"""Set download URL for normal environment"""

View file

@ -401,26 +401,19 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`",
"\n
Arguments:
This subcommand accepts a number of paths to directories to the crates
and/or artifacts to compile. For example:
and/or artifacts to compile. For example, for a quick build of a usable
compiler:
./x.py build library/core
./x.py build library/core library/proc_macro
./x.py build library/std --stage 1
./x.py build --stage 1 library/std
If no arguments are passed then the complete artifacts for that stage are
also compiled.
This will build a compiler and standard library from the local source code.
Once this is done, build/$ARCH/stage1 contains a usable compiler.
./x.py build
./x.py build --stage 1
If no arguments are passed then the default artifacts for that stage are
compiled. For example:
For a quick build of a usable compiler, you can pass:
./x.py build --stage 1 library/test
This will first build everything once (like `--stage 0` without further
arguments would), and then use the compiler built in stage 0 to build
library/test and its dependencies.
Once this is done, build/$ARCH/stage1 contains a usable compiler.",
./x.py build --stage 0
./x.py build ",
);
}
"check" | "c" => {
@ -430,14 +423,9 @@ Arguments:
This subcommand accepts a number of paths to directories to the crates
and/or artifacts to compile. For example:
./x.py check library/core
./x.py check library/core library/proc_macro
./x.py check library/std
If no arguments are passed then the complete artifacts are compiled: std, test, and rustc. Note
also that since we use `cargo check`, by default this will automatically enable incremental
compilation, so there's no need to pass it separately, though it won't hurt. We also completely
ignore the stage passed, as there's no way to compile in non-stage 0 without actually building
the compiler.",
If no arguments are passed then many artifacts are checked.",
);
}
"clippy" => {