Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Label more build steps #92182

Merged
merged 2 commits into from
Jan 5, 2022
+13 −24
Merged

Label more build steps #92182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e3d92
Label more build steps.
nnethercote Dec 21, 2021
2e74ca1
Tweak the usage messages for `x.py build` and `x.py check`.
nnethercote Dec 21, 2021
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
3 changes: 2 additions & 1 deletion src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,7 @@ def bootstrap_binary(self):

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)
Expand Down Expand Up @@ -1133,7 +1134,7 @@ def update_submodules(self):
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"""
Expand Down
34 changes: 11 additions & 23 deletions src/bootstrap/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

./x.py build library/core
./x.py build library/core library/proc_macro
./x.py build library/std --stage 1

If no arguments are passed then the complete artifacts for that stage are
also compiled.
and/or artifacts to compile. For example, for a quick build of a usable
compiler:

./x.py build
./x.py build --stage 1
./x.py build --stage 1 library/std

For a quick build of a usable compiler, you can pass:
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 --stage 1 library/test
If no arguments are passed then the default artifacts for that stage are
compiled. For example:

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" => {
Expand All @@ -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" => {
Expand Down