Skip to content

Commit 74d0939

Browse files
committed
Auto merge of #50955 - steveklabnik:update-libbacktrace, r=alexcrichton
Update libbacktrace We haven't updated libbacktrace in two years. This is just blindly updating to the latest HEAD; I'd like to see what travis says. It at least builds on my machine, running some tests... This perpetuates the patches from #30908
2 parents 4f99f37 + 7c14a54 commit 74d0939

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+63
-40245
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@
5353
[submodule "src/tools/lld"]
5454
path = src/tools/lld
5555
url = https://github.com/rust-lang/lld.git
56+
[submodule "src/libbacktrace"]
57+
path = src/libbacktrace
58+
url = https://github.com/rust-lang-nursery/libbacktrace

src/Cargo.lock

+5-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ name = "backtrace"
105105
version = "0.3.6"
106106
source = "registry+https://github.com/rust-lang/crates.io-index"
107107
dependencies = [
108-
"backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
108+
"backtrace-sys 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
109109
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
110110
"libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
111111
"rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -114,11 +114,12 @@ dependencies = [
114114

115115
[[package]]
116116
name = "backtrace-sys"
117-
version = "0.1.16"
117+
version = "0.1.22"
118118
source = "registry+https://github.com/rust-lang/crates.io-index"
119119
dependencies = [
120120
"cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
121121
"libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
122+
"pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
122123
]
123124

124125
[[package]]
@@ -2513,6 +2514,7 @@ dependencies = [
25132514
"alloc_jemalloc 0.0.0",
25142515
"alloc_system 0.0.0",
25152516
"build_helper 0.1.0",
2517+
"cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
25162518
"compiler_builtins 0.0.0",
25172519
"core 0.0.0",
25182520
"libc 0.0.0",
@@ -3051,7 +3053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
30513053
"checksum assert_cli 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5da59dbd8df54562665b925b427221ceda9b771408cb8a6cbd2125d3b001330b"
30523054
"checksum atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4"
30533055
"checksum backtrace 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe525f66f42d207968308ee86bc2dd60aa5fab535b22e616323a173d097d8e"
3054-
"checksum backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661"
3056+
"checksum backtrace-sys 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5fd343a2466c4603f76f38de264bc0526cffc7fa38ba52fb9f13237eccc1ced2"
30553057
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
30563058
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
30573059
"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"

src/libbacktrace

Submodule libbacktrace added at f4d02bb

0 commit comments

Comments
 (0)