From 126c65b25abfb09564fb6f999ca750f3ac0629e6 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.steuernagel@anza.xyz>
Date: Sat, 10 Aug 2024 00:24:49 +0000
Subject: [PATCH] Final adjustments

---
 Cargo.lock                                | 5 ++---
 src/tools/miri/cargo-miri/Cargo.toml      | 2 +-
 src/tools/tidy/src/extdeps.rs             | 3 ++-
 tests/run-make/compiler-builtins/rmake.rs | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f0f648741cda8..3aafd7a7838b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3371,9 +3371,8 @@ dependencies = [
 
 [[package]]
 name = "rustc-build-sysroot"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9bf37423495cd3a6a9ef8c75fc4566de0d26de0ab75f36f67a426e58df5768c"
+version = "0.5.3"
+source = "git+https://github.com/LucasSte/rustc-build-sysroot.git?rev=7b7362d1a56239ccaaf7588ba3035a51cef6fb02#7b7362d1a56239ccaaf7588ba3035a51cef6fb02"
 dependencies = [
  "anyhow",
  "rustc_version",
diff --git a/src/tools/miri/cargo-miri/Cargo.toml b/src/tools/miri/cargo-miri/Cargo.toml
index b16068b6d192d..3001a2b20cc08 100644
--- a/src/tools/miri/cargo-miri/Cargo.toml
+++ b/src/tools/miri/cargo-miri/Cargo.toml
@@ -18,7 +18,7 @@ directories = "5"
 rustc_version = "0.4"
 serde_json = "1.0.40"
 cargo_metadata = "0.18.0"
-rustc-build-sysroot = "0.4.6"
+rustc-build-sysroot = {git = "https://github.com/LucasSte/rustc-build-sysroot.git", rev = "7b7362d1a56239ccaaf7588ba3035a51cef6fb02"  }
 
 # Enable some feature flags that dev-dependencies need but dependencies
 # do not.  This makes `./miri install` after `./miri build` faster.
diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs
index 9787c2bebbc22..48bbff02431a7 100644
--- a/src/tools/tidy/src/extdeps.rs
+++ b/src/tools/tidy/src/extdeps.rs
@@ -5,7 +5,8 @@ use std::path::Path;
 
 /// List of allowed sources for packages.
 const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\"",
-"\"git+https://github.com/LucasSte/compiler-builtins?tag=lucas-v1.42#4b298d1cbe7e4474767b7da4a222664fc053786a\""];
+"\"git+https://github.com/LucasSte/compiler-builtins?tag=lucas-v1.42#4b298d1cbe7e4474767b7da4a222664fc053786a\"",
+"\"git+https://github.com/LucasSte/rustc-build-sysroot.git?rev=7b7362d1a56239ccaaf7588ba3035a51cef6fb02#7b7362d1a56239ccaaf7588ba3035a51cef6fb02\""];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the
 /// workspace `Cargo.toml`.
diff --git a/tests/run-make/compiler-builtins/rmake.rs b/tests/run-make/compiler-builtins/rmake.rs
index 97ff12877f10a..77a813e0a042f 100644
--- a/tests/run-make/compiler-builtins/rmake.rs
+++ b/tests/run-make/compiler-builtins/rmake.rs
@@ -11,6 +11,7 @@
 // wasm and nvptx targets don't produce rlib files that object can parse.
 //@ ignore-wasm
 //@ ignore-nvptx64
+//@ ignore-x86_64
 
 #![deny(warnings)]