mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-28 19:27:30 +03:00
Replace stage0-tools-bin with stage1-tools-bin
This commit is contained in:
@@ -1597,7 +1597,7 @@ pub fn cargo_miri_cmd(&self, run_compiler: Compiler) -> BootstrapCommand {
|
||||
cmd.env("CARGO", &self.initial_cargo);
|
||||
// Need to add the `run_compiler` libs. Those are the libs produces *by* `build_compiler`
|
||||
// in `tool::ToolBuild` step, so they match the Miri we just built. However this means they
|
||||
// are actually living one stage up, i.e. we are running `stage0-tools-bin/miri` with the
|
||||
// are actually living one stage up, i.e. we are running `stage1-tools-bin/miri` with the
|
||||
// libraries in `stage1/lib`. This is an unfortunate off-by-1 caused (possibly) by the fact
|
||||
// that Miri doesn't have an "assemble" step like rustc does that would cross the stage boundary.
|
||||
// We can't use `add_rustc_lib_path` as that's a NOP on Windows but we do need these libraries
|
||||
|
||||
@@ -96,7 +96,7 @@ ENV RUST_CONFIGURE_ARGS \
|
||||
--set rust.codegen-units=1
|
||||
|
||||
ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
|
||||
./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
|
||||
./build/$HOSTS/stage1-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
|
||||
--host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap
|
||||
|
||||
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=clang
|
||||
|
||||
@@ -4,7 +4,7 @@ set -eux
|
||||
|
||||
python3 ../x.py build --set rust.debug=true opt-dist
|
||||
|
||||
./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
|
||||
./build/$HOSTS/stage1-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
|
||||
--host $HOSTS --target $HOSTS \
|
||||
--include-default-paths \
|
||||
build-manifest bootstrap
|
||||
|
||||
@@ -656,7 +656,7 @@ auto:
|
||||
--enable-full-tools
|
||||
--enable-profiler
|
||||
--set rust.codegen-units=1
|
||||
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
|
||||
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage1-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
|
||||
DIST_REQUIRE_ALL_TOOLS: 1
|
||||
CODEGEN_BACKENDS: llvm,cranelift
|
||||
<<: *job-windows-8c
|
||||
|
||||
@@ -118,7 +118,7 @@ Here is an example of how can `opt-dist` be used locally (outside of CI):
|
||||
```
|
||||
3. Run the tool with the `local` mode and provide necessary parameters:
|
||||
```bash
|
||||
./build/host/stage0-tools-bin/opt-dist local \
|
||||
./build/host/stage1-tools-bin/opt-dist local \
|
||||
--target-triple <target> \ # select target, e.g. "x86_64-unknown-linux-gnu"
|
||||
--checkout-dir <path> \ # path to rust checkout, e.g. "."
|
||||
--llvm-dir <path> \ # path to built LLVM toolchain, e.g. "/foo/bar/llvm/install"
|
||||
|
||||
Reference in New Issue
Block a user