Skip to content

Commit 2760d58

Browse files
committed
bootstrap: remove --build-base and use --build-root and --build-test-suite-root instead
1 parent e95ab24 commit 2760d58

File tree

1 file changed

+5
-1
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+5
-1
lines changed

src/bootstrap/src/core/build_steps/test.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,11 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
17651765
cmd.arg("--src-root").arg(&builder.src);
17661766
cmd.arg("--src-test-suite-root").arg(builder.src.join("tests").join(suite));
17671767

1768-
cmd.arg("--build-base").arg(testdir(builder, compiler.host).join(suite));
1768+
// N.B. it's important to distinguish between the *root* build directory, the *host* build
1769+
// directory immediately under the root build directory, and the test-suite-specific build
1770+
// directory.
1771+
cmd.arg("--build-root").arg(&builder.out);
1772+
cmd.arg("--build-test-suite-root").arg(testdir(builder, compiler.host).join(suite));
17691773

17701774
// When top stage is 0, that means that we're testing an externally provided compiler.
17711775
// In that case we need to use its specific sysroot for tests to pass.

0 commit comments

Comments
 (0)