Skip to content

Commit

Permalink
Final adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
LucasSte committed Aug 10, 2024
1 parent 9c1d443 commit 126c65b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/cargo-miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion src/tools/tidy/src/extdeps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/compiler-builtins/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down

0 comments on commit 126c65b

Please sign in to comment.