diff options
Diffstat (limited to 'compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh')
| -rwxr-xr-x | compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh b/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh index db69541b226..6473c6ad67d 100755 --- a/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh +++ b/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e cd "$(dirname "$0")/../" @@ -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' } + rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' } + rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' } + ++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 |