mirror of
https://github.com/rust-lang/rust
synced 2024-10-06 08:40:35 +00:00
c65996ea3b
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.
30 lines
951 B
Plaintext
30 lines
951 B
Plaintext
[submodule "src/llvm"]
|
|
path = src/llvm
|
|
url = https://github.com/rust-lang/llvm.git
|
|
branch = master
|
|
[submodule "src/compiler-rt"]
|
|
path = src/compiler-rt
|
|
url = https://github.com/rust-lang/compiler-rt.git
|
|
[submodule "src/rt/hoedown"]
|
|
path = src/rt/hoedown
|
|
url = https://github.com/rust-lang/hoedown.git
|
|
branch = rust-2015-09-21-do-not-delete
|
|
[submodule "src/jemalloc"]
|
|
path = src/jemalloc
|
|
url = https://github.com/rust-lang/jemalloc.git
|
|
[submodule "src/rust-installer"]
|
|
path = src/rust-installer
|
|
url = https://github.com/rust-lang/rust-installer.git
|
|
[submodule "src/liblibc"]
|
|
path = src/liblibc
|
|
url = https://github.com/rust-lang/libc.git
|
|
[submodule "src/doc/nomicon"]
|
|
path = src/doc/nomicon
|
|
url = https://github.com/rust-lang-nursery/nomicon
|
|
[submodule "src/tools/cargo"]
|
|
path = cargo
|
|
url = https://github.com/rust-lang/cargo
|
|
[submodule "reference"]
|
|
path = src/doc/reference
|
|
url = https://github.com/rust-lang-nursery/reference.git
|