Skip to content

Commit b1305c2

Browse files
alexcrichtonalexcrichton
committed
Update some *-sys dependencies of Cargo/RLS
This is intended to help solve rust-lang#54206 on nightly where the RLS on MinGW is having build issues with accidentally building a `curl` library which links to pthread symbols on Windows (where it should use native mutex locking instead). The build system for these `*-sys` crates have all been rewritten to be based on `cc` to bypass native build systems and platform detection to make sure we configure them correctly.
1 parent 20dc0c5 commit b1305c2

File tree

1 file changed

+35
-36
lines changed

1 file changed

+35
-36
lines changed

‎src/Cargo.lock

+35-36
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name = "alloc_jemalloc"
2020
version = "0.0.0"
2121
dependencies = [
2222
"build_helper 0.1.0",
23-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
23+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2424
"compiler_builtins 0.0.0",
2525
"core 0.0.0",
2626
"libc 0.0.0",
@@ -112,7 +112,7 @@ name = "backtrace-sys"
112112
version = "0.1.24"
113113
source = "registry+https://github.com/rust-lang/crates.io-index"
114114
dependencies = [
115-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
115+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
116116
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
117117
]
118118

@@ -131,7 +131,7 @@ name = "bootstrap"
131131
version = "0.0.0"
132132
dependencies = [
133133
"build_helper 0.1.0",
134-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
134+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
135135
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
136136
"filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
137137
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -198,7 +198,7 @@ dependencies = [
198198
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
199199
"lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
200200
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
201-
"libgit2-sys 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
201+
"libgit2-sys 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
202202
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
203203
"miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
204204
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -240,7 +240,7 @@ version = "0.1.0"
240240

241241
[[package]]
242242
name = "cc"
243-
version = "1.0.22"
243+
version = "1.0.25"
244244
source = "registry+https://github.com/rust-lang/crates.io-index"
245245

246246
[[package]]
@@ -356,7 +356,7 @@ name = "cmake"
356356
version = "0.1.33"
357357
source = "registry+https://github.com/rust-lang/crates.io-index"
358358
dependencies = [
359-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
359+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
360360
]
361361

362362
[[package]]
@@ -387,7 +387,7 @@ dependencies = [
387387
name = "compiler_builtins"
388388
version = "0.0.0"
389389
dependencies = [
390-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
390+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
391391
"core 0.0.0",
392392
]
393393

@@ -549,7 +549,7 @@ name = "curl"
549549
version = "0.4.14"
550550
source = "registry+https://github.com/rust-lang/crates.io-index"
551551
dependencies = [
552-
"curl-sys 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
552+
"curl-sys 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
553553
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
554554
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
555555
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -561,12 +561,12 @@ dependencies = [
561561

562562
[[package]]
563563
name = "curl-sys"
564-
version = "0.4.8"
564+
version = "0.4.10"
565565
source = "registry+https://github.com/rust-lang/crates.io-index"
566566
dependencies = [
567-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
567+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
568568
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
569-
"libz-sys 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
569+
"libz-sys 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
570570
"openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)",
571571
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
572572
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -825,7 +825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
825825
dependencies = [
826826
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
827827
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
828-
"libgit2-sys 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
828+
"libgit2-sys 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
829829
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
830830
"openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
831831
"openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1073,38 +1073,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
10731073

10741074
[[package]]
10751075
name = "libgit2-sys"
1076-
version = "0.7.7"
1076+
version = "0.7.8"
10771077
source = "registry+https://github.com/rust-lang/crates.io-index"
10781078
dependencies = [
1079-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1080-
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
1081-
"curl-sys 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
1079+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1080+
"curl-sys 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
10821081
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
1083-
"libssh2-sys 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
1084-
"libz-sys 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
1082+
"libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
1083+
"libz-sys 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
10851084
"openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)",
10861085
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
10871086
]
10881087

10891088
[[package]]
10901089
name = "libssh2-sys"
1091-
version = "0.2.10"
1090+
version = "0.2.11"
10921091
source = "registry+https://github.com/rust-lang/crates.io-index"
10931092
dependencies = [
1094-
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
1093+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
10951094
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
1096-
"libz-sys 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
1095+
"libz-sys 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
10971096
"openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)",
10981097
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
10991098
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
11001099
]
11011100

11021101
[[package]]
11031102
name = "libz-sys"
1104-
version = "1.0.20"
1103+
version = "1.0.22"
11051104
source = "registry+https://github.com/rust-lang/crates.io-index"
11061105
dependencies = [
1107-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1106+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
11081107
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
11091108
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
11101109
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1152,7 +1151,7 @@ name = "lzma-sys"
11521151
version = "0.1.10"
11531152
source = "registry+https://github.com/rust-lang/crates.io-index"
11541153
dependencies = [
1155-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1154+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
11561155
"filetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
11571156
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
11581157
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1256,7 +1255,7 @@ name = "miniz-sys"
12561255
version = "0.1.10"
12571256
source = "registry+https://github.com/rust-lang/crates.io-index"
12581257
dependencies = [
1259-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1258+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
12601259
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
12611260
]
12621261

@@ -1365,15 +1364,15 @@ name = "openssl-src"
13651364
version = "110.0.7+1.1.0i"
13661365
source = "registry+https://github.com/rust-lang/crates.io-index"
13671366
dependencies = [
1368-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1367+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
13691368
]
13701369

13711370
[[package]]
13721371
name = "openssl-sys"
13731372
version = "0.9.35"
13741373
source = "registry+https://github.com/rust-lang/crates.io-index"
13751374
dependencies = [
1376-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1375+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
13771376
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
13781377
"openssl-src 110.0.7+1.1.0i (registry+https://github.com/rust-lang/crates.io-index)",
13791378
"pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1580,7 +1579,7 @@ dependencies = [
15801579
name = "profiler_builtins"
15811580
version = "0.0.0"
15821581
dependencies = [
1583-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
1582+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
15841583
"compiler_builtins 0.0.0",
15851584
"core 0.0.0",
15861585
]
@@ -2094,7 +2093,7 @@ dependencies = [
20942093
name = "rustc_codegen_llvm"
20952094
version = "0.0.0"
20962095
dependencies = [
2097-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
2096+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
20982097
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
20992098
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
21002099
"rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2228,7 +2227,7 @@ name = "rustc_llvm"
22282227
version = "0.0.0"
22292228
dependencies = [
22302229
"build_helper 0.1.0",
2231-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
2230+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
22322231
]
22332232

22342233
[[package]]
@@ -2631,7 +2630,7 @@ dependencies = [
26312630
"alloc_jemalloc 0.0.0",
26322631
"alloc_system 0.0.0",
26332632
"build_helper 0.1.0",
2634-
"cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
2633+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
26352634
"compiler_builtins 0.0.0",
26362635
"core 0.0.0",
26372636
"libc 0.0.0",
@@ -3145,7 +3144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31453144
"checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32"
31463145
"checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9"
31473146
"checksum cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6809b327f87369e6f3651efd2c5a96c49847a3ed2559477ecba79014751ee1"
3148-
"checksum cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6007c146fdd28d4512a794b07ffe9d8e89e6bf86e2e0c4ddff2e1fb54a0007"
3147+
"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
31493148
"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
31503149
"checksum chalk-engine 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "25ce2f28f55ed544a2a3756b7acf41dd7d6f27acffb2086439950925506af7d0"
31513150
"checksum chalk-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "295635afd6853aa9f20baeb7f0204862440c0fe994c5a253d5f479dac41d047e"
@@ -3169,7 +3168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31693168
"checksum crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015"
31703169
"checksum crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
31713170
"checksum curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "444c2f9e71458b34e75471ed8d756947a0bb920b8b8b9bfc56dfcc4fc6819a13"
3172-
"checksum curl-sys 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "981bd902fcd8b8b999cf71b81447e27d66c3493a7f62f1372866fd32986c0c82"
3171+
"checksum curl-sys 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2edeedbbd9c7cdccb14bfb5dfbcc108901f99d3411eb5bab3758789377c5bec4"
31733172
"checksum datafrog 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16d724bf4ffe77cdceeecd461009b5f8d9e23c5d645d68bedb4586bf43e7e142"
31743173
"checksum derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ceed73957c449214f8440eec8ad7fa282b67dc9eacbb24a3085b15d60397a17a"
31753174
"checksum derive_more 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46c7f14685a20f5dd08e7f754f2ea8cc064d8f4214ae21116c106a2768ba7b9b"
@@ -3224,9 +3223,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32243223
"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
32253224
"checksum lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d33a48d0365c96081958cc663eef834975cb1e8d8bea3378513fc72bdbf11e50"
32263225
"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
3227-
"checksum libgit2-sys 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6ab62b46003ba97701554631fa570d9f7e7947e2480ae3d941e555a54a2c0f05"
3228-
"checksum libssh2-sys 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "10dbc0957a27626444f5a3f523e6b97a70c3d702999bf1c7161cfbe7a25a9368"
3229-
"checksum libz-sys 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "f5f9aba969b3c45fe9c94bec65895868a9ceca9a600699f4054b75747a19c7c6"
3226+
"checksum libgit2-sys 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "44b1900be992dd5698bd3bb422921e336306d413e2860e6ba3b50e62e6219c4c"
3227+
"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
3228+
"checksum libz-sys 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "65ff614643d7635dfa2151913d95c4ee90ee1fe15d9e0980f4dcb1a7e5837c18"
32303229
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
32313230
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
32323231
"checksum log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cba860f648db8e6f269df990180c2217f333472b4a6e901e97446858487971e2"

0 commit comments

Comments
 (0)