diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2021-05-02 14:27:57 -0400 |
|---|---|---|
| committer | Caleb Cartwright <caleb.cartwright@outlook.com> | 2021-05-14 21:54:06 -0500 |
| commit | b3494378aa78a1648eb624c97cdd1b3d191f17b2 (patch) | |
| tree | b189ee30aa0eccd95950d02b4abce71a4e9372f2 /src | |
| parent | 956e0bae58eb04b6ea48fb2474990437e0757ef9 (diff) | |
| download | rust-b3494378aa78a1648eb624c97cdd1b3d191f17b2.tar.gz rust-b3494378aa78a1648eb624c97cdd1b3d191f17b2.zip | |
Don't copy tool dependencies to the sysroot
This fixes the following error:
```
error: found crates (`serde_derive` and `serde_derive`) with colliding StableCrateId values.
--> /home/joshua/.local/lib/cargo/registry/src/github.com-1ecc6299db9ec823/cargo_metadata-0.8.2/src/lib.rs:162:1
|
162 | extern crate serde_derive;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
```
This is a bug in resolve (https://github.com/rust-lang/rust/issues/56935)
but it will be difficult to fix in the near future. This works around it
in the meantime by not copying serde_derive and other dependencies to
the sysroot when they're built for other tools. This rebuilds the
dependencies slightly more often than necessary, but avoids the crate
conflicts.
This can be reverted once #56935 is fixed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/check.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index c6844c16315..5003d6693f7 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -342,10 +342,6 @@ macro_rules! tool_check_step { true, ); - let libdir = builder.sysroot_libdir(compiler, target); - let hostdir = builder.sysroot_libdir(compiler, compiler.host); - add_to_sysroot(&builder, &libdir, &hostdir, &stamp(builder, compiler, target)); - /// Cargo's output path in a given stage, compiled by a particular /// compiler for the specified target. fn stamp( |
