Skip to content

Commit

Permalink
Unrolled build for rust-lang#127805
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127805 - Mrmaxmeier:run-make-bump-gimli, r=jieyouxu

run-make-support: update gimli to 0.31.0

This version bump is required for the tests in rust-lang#126985 as suggested [here](rust-lang#126985 (comment)).

r​? tgross35
(^ that didn't work. cc `@tgross35)`

try-job: x86_64-msvc
try-job: x86_64-mingw
try-job: aarch64-apple
try-job: test-various
try-job: armhf-gnu
try-job: dist-x86_64-linux
  • Loading branch information
rust-timer authored Jul 16, 2024
2 parents a91f7d7 + 664907c commit 8b0a504
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1618,6 +1618,17 @@ dependencies = [
"rustc-std-workspace-core",
]

[[package]]
name = "gimli"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
dependencies = [
"fallible-iterator",
"indexmap",
"stable_deref_trait",
]

[[package]]
name = "glob"
version = "0.3.1"
Expand Down Expand Up @@ -3421,7 +3432,7 @@ dependencies = [
"ar",
"bstr",
"build_helper",
"gimli 0.28.1",
"gimli 0.31.0",
"object 0.34.0",
"regex",
"similar",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/run-make-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object = "0.34.0"
similar = "2.5.0"
wasmparser = "0.118.2"
regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace
gimli = "0.28.1"
gimli = "0.31.0"
ar = "0.9.0"

build_helper = { path = "../build_helper" }

0 comments on commit 8b0a504

Please sign in to comment.