Skip to content

Commit e35a4bd

Browse files
authored
Rollup merge of #92182 - nnethercote:label-more-build-steps, r=Mark-Simulacrum
Label more build steps Some small improvements. r? ```@Mark-Simulacrum```
2 parents b03c504 + 2e74ca1 commit e35a4bd

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

src/bootstrap/bootstrap.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,7 @@ def bootstrap_binary(self):
974974

975975
def build_bootstrap(self):
976976
"""Build bootstrap"""
977+
print("Building rustbuild")
977978
build_dir = os.path.join(self.build_dir, "bootstrap")
978979
if self.clean and os.path.exists(build_dir):
979980
shutil.rmtree(build_dir)
@@ -1133,7 +1134,7 @@ def update_submodules(self):
11331134
recorded_submodules[data[3]] = data[2]
11341135
for module in filtered_submodules:
11351136
self.update_submodule(module[0], module[1], recorded_submodules)
1136-
print("Submodules updated in %.2f seconds" % (time() - start_time))
1137+
print(" Submodules updated in %.2f seconds" % (time() - start_time))
11371138

11381139
def set_dist_environment(self, url):
11391140
"""Set download URL for normal environment"""

src/bootstrap/flags.rs

+11-23
Original file line numberDiff line numberDiff line change
@@ -401,26 +401,19 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`",
401401
"\n
402402
Arguments:
403403
This subcommand accepts a number of paths to directories to the crates
404-
and/or artifacts to compile. For example:
405-
406-
./x.py build library/core
407-
./x.py build library/core library/proc_macro
408-
./x.py build library/std --stage 1
409-
410-
If no arguments are passed then the complete artifacts for that stage are
411-
also compiled.
404+
and/or artifacts to compile. For example, for a quick build of a usable
405+
compiler:
412406
413-
./x.py build
414-
./x.py build --stage 1
407+
./x.py build --stage 1 library/std
415408
416-
For a quick build of a usable compiler, you can pass:
409+
This will build a compiler and standard library from the local source code.
410+
Once this is done, build/$ARCH/stage1 contains a usable compiler.
417411
418-
./x.py build --stage 1 library/test
412+
If no arguments are passed then the default artifacts for that stage are
413+
compiled. For example:
419414
420-
This will first build everything once (like `--stage 0` without further
421-
arguments would), and then use the compiler built in stage 0 to build
422-
library/test and its dependencies.
423-
Once this is done, build/$ARCH/stage1 contains a usable compiler.",
415+
./x.py build --stage 0
416+
./x.py build ",
424417
);
425418
}
426419
"check" | "c" => {
@@ -430,14 +423,9 @@ Arguments:
430423
This subcommand accepts a number of paths to directories to the crates
431424
and/or artifacts to compile. For example:
432425
433-
./x.py check library/core
434-
./x.py check library/core library/proc_macro
426+
./x.py check library/std
435427
436-
If no arguments are passed then the complete artifacts are compiled: std, test, and rustc. Note
437-
also that since we use `cargo check`, by default this will automatically enable incremental
438-
compilation, so there's no need to pass it separately, though it won't hurt. We also completely
439-
ignore the stage passed, as there's no way to compile in non-stage 0 without actually building
440-
the compiler.",
428+
If no arguments are passed then many artifacts are checked.",
441429
);
442430
}
443431
"clippy" => {

0 commit comments

Comments
 (0)