Skip to content

Commit b75116d

Browse files
committed
Don't put Cargo into the rustc workspace
This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to the top directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace.
1 parent 11bc48a commit b75116d

File tree

7 files changed

+7
-670
lines changed

7 files changed

+7
-670
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
path = src/liblibc
2020
url = https://github.com/rust-lang/libc.git
2121
[submodule "src/tools/cargo"]
22-
path = src/tools/cargo
22+
path = cargo
2323
url = https://github.com/rust-lang/cargo
2424
[submodule "reference"]
2525
path = src/doc/reference

src/tools/cargo renamed to cargo

Submodule cargo updated from 0000000 to d17b61a

0 commit comments

Comments
 (0)