diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-01-22 14:15:12 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-02-02 10:39:23 +0100 |
| commit | 54523b8ea84cb9360639568a6c3c3e17c31ab5a8 (patch) | |
| tree | d8399fc03b44f147a6e00c4abfc5909511b34d0a /scripts | |
| parent | e4ae9ef3b0ee28b3f3602a55e02d5be857379dd3 (diff) | |
| download | rust-54523b8ea84cb9360639568a6c3c3e17c31ab5a8.tar.gz rust-54523b8ea84cb9360639568a6c3c3e17c31ab5a8.zip | |
Fix rustc bootstrap test
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/test_bootstrap.sh | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/scripts/test_bootstrap.sh b/scripts/test_bootstrap.sh index db69541b226..15f97c867a1 100755 --- a/scripts/test_bootstrap.sh +++ b/scripts/test_bootstrap.sh @@ -14,21 +14,18 @@ git checkout -- . git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')" git apply - <<EOF -diff --git a/.gitmodules b/.gitmodules -index 984113151de..c1e9d960d56 100644 ---- a/.gitmodules -+++ b/.gitmodules -@@ -34,10 +34,6 @@ - [submodule "src/doc/edition-guide"] - path = src/doc/edition-guide - url = https://github.com/rust-lang/edition-guide.git --[submodule "src/llvm-project"] -- path = src/llvm-project -- url = https://github.com/rust-lang/llvm-project.git -- branch = rustc/11.0-2020-10-12 - [submodule "src/doc/embedded-book"] - path = src/doc/embedded-book - url = https://github.com/rust-embedded/book.git +diff --git a/Cargo.toml b/Cargo.toml +index 5bd1147cad5..10d68a2ff14 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -111,5 +111,7 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } + # source code for this crate. + backtrace = { path = "library/backtrace" } + ++compiler_builtins = { path = "../build_sysroot/compiler-builtins" } ++ + [patch."https://github.com/rust-lang/rust-clippy"] + clippy_lints = { path = "src/tools/clippy/clippy_lints" } diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 23e689fcae7..5f077b765b6 100644 --- a/compiler/rustc_data_structures/Cargo.toml @@ -41,6 +38,19 @@ index 23e689fcae7..5f077b765b6 100644 [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["fileapi", "psapi"] } +diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml +index d95b5b7f17f..00b6f0e3635 100644 +--- a/library/alloc/Cargo.toml ++++ b/library/alloc/Cargo.toml +@@ -8,7 +8,7 @@ edition = "2018" + + [dependencies] + core = { path = "../core" } +-compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std'] } ++compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std', 'no-asm'] } + + [dev-dependencies] + rand = "0.7" EOF cat > config.toml <<EOF |