From ae34ade595c78ecae1d26ffc43007a570e721675 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 27 May 2020 20:24:59 -0600 Subject: [PATCH] Use path to patch compiler-builtins --- .cargo/config | 1 + .gitmodules | 3 +++ Xargo.toml | 3 --- compiler-builtins | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .cargo/config create mode 160000 compiler-builtins diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 0000000000..264d5b2baf --- /dev/null +++ b/.cargo/config @@ -0,0 +1 @@ +paths = ["compiler-builtins"] diff --git a/.gitmodules b/.gitmodules index aaee5b3c47..f8c33970ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "pthreads-emb"] path = pthreads-emb url = https://gitlab.redox-os.org/redox-os/pthreads-emb.git +[submodule "compiler-builtins"] + path = compiler-builtins + url = https://github.com/rust-lang/compiler-builtins.git diff --git a/Xargo.toml b/Xargo.toml index de0c1afa51..ea3144eb6a 100644 --- a/Xargo.toml +++ b/Xargo.toml @@ -1,4 +1 @@ [dependencies.alloc] - -[patch.crates-io] -compiler_builtins = { git = "https://github.com/rust-lang/compiler-builtins.git", rev = "25ea08da2824b8137b6ac1222b0171cb07cca083" } diff --git a/compiler-builtins b/compiler-builtins new file mode 160000 index 0000000000..25ea08da28 --- /dev/null +++ b/compiler-builtins @@ -0,0 +1 @@ +Subproject commit 25ea08da2824b8137b6ac1222b0171cb07cca083