Skip to content

Commit f709c74

Browse files
MikaelUrankarMikaelUrankar
committed
lang/rust: Update to 1.79.0
Announce: https://blog.rust-lang.org/2024/06/13/Rust-1.79.0.html ChangeLog: https://github.com/rust-lang/rust/releases/tag/1.79.0 PR: 279707 Tested by: pkubaj,mikael
1 parent 3142fac commit f709c74

File tree

11 files changed

+189
-126
lines changed

11 files changed

+189
-126
lines changed

‎Mk/Uses/cargo.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
9797

9898
CARGO_BUILDDEP?= yes
9999
. if ${CARGO_BUILDDEP:tl} == "yes"
100-
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.78.0:lang/${RUST_DEFAULT}
100+
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT}
101101
. elif ${CARGO_BUILDDEP:tl} == "any-version"
102102
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
103103
. endif

‎Mk/bsd.gecko.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD}
7474
BUNDLE_LIBS= yes
7575

7676
BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \
77-
${RUST_DEFAULT}>=1.78.0:lang/${RUST_DEFAULT} \
77+
${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT} \
7878
node:www/node
7979
LIB_DEPENDS+= libdrm.so:graphics/libdrm
8080
RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci

‎lang/rust-bootstrap/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# to upload them to ~/public_distfiles on freefall in preparation
33
# for the next lang/rust update.
44
PORTNAME= rust
5-
PORTVERSION= 1.78.0
5+
PORTVERSION= 1.79.0
66
CATEGORIES= lang
77
MASTER_SITES= https://static.rust-lang.org/dist/
88
PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-
@@ -79,7 +79,6 @@ do-configure:
7979
# Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
8080
@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
8181
${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
82-
@${ECHO_CMD} 'changelog-seen=2' > ${WRKSRC}/config.toml
8382
@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
8483
@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
8584
@${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml

‎lang/rust-bootstrap/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1714719126
2-
SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
3-
SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212
1+
TIMESTAMP = 1718102335
2+
SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a
3+
SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512

‎lang/rust/Makefile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PORTNAME= rust
2-
PORTVERSION?= 1.78.0
2+
PORTVERSION?= 1.79.0
33
PORTREVISION?= 0
44
CATEGORIES= lang
55
MASTER_SITES= https://static.rust-lang.org/dist/:src \
@@ -67,8 +67,8 @@ WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
6767
_RUST_TARGETS+=wasm32-unknown-unknown
6868

6969
# See WRKSRC/src/stage0.json for the date and version values
70-
BOOTSTRAPS_DATE?= 2024-03-21
71-
RUST_BOOTSTRAP_VERSION?= 1.77.0
70+
BOOTSTRAPS_DATE?= 2024-05-02
71+
RUST_BOOTSTRAP_VERSION?= 1.78.0
7272

7373
CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
7474

@@ -153,9 +153,6 @@ do-configure:
153153
@cd ${WRKDIR}/${_component}-*-${OPSYS:tl} && \
154154
${SH} install.sh --prefix=${WRKDIR}/bootstrap --verbose
155155
.endfor
156-
.if !defined(NIGHTLY_DATE)
157-
@${ECHO_CMD} 'changelog-seen=2' > ${WRKSRC}/config.toml
158-
.endif
159156
@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
160157
@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
161158
@${ECHO_CMD} 'build-stage=2' >> ${WRKSRC}/config.toml

‎lang/rust/distinfo‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
TIMESTAMP = 1714719125
2-
SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
3-
SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212
4-
SHA256 (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = b8c0c1f4ac561c94023ac3e61bb05cc48868b08b408e4a889209628552cfa696
5-
SIZE (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = 55677936
6-
SHA256 (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = cf609884cf154e8ba9bd3838bf508c100c5420dd9b62dcdc1d2d772637745806
7-
SIZE (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = 25613204
8-
SHA256 (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = bd6d57c016f64facd353c16d4540b894ad46a8153c03292c4dbdd1e71883d296
9-
SIZE (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = 8789392
10-
SHA256 (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = c8f690079fa43d18c644b7239d884a4f40319299ed04f274be85e8572398b7a0
11-
SIZE (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = 45066612
12-
SHA256 (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = f4300a839fa6df8a3861b1583d47f17b5efd72a09466a6056ed654e7415936fd
13-
SIZE (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = 26400816
14-
SHA256 (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 82b166b6d3e0e4f09224bfc75e0d3a9db75228983d20e021adef3922c50c35ce
15-
SIZE (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 9765968
16-
SHA256 (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = beb39431f8b0625607b2a276c77001c5e71613005a6b2b72a3bd94878e8d2c5a
17-
SIZE (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = 56049192
18-
SHA256 (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = fd9ad61cd1bdc3e743b6d86a4f1b635c365750d6ea7de193eba58f608cde9a99
19-
SIZE (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = 25031820
20-
SHA256 (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 38192d50b9358b60dffb93a70986a05271f410ba75f7d2a66671281a7d53ea58
21-
SIZE (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 8806328
22-
SHA256 (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = f673b37ca9d259ac619987ff0559c922f6284eaa6c77e6dcf04f665cba46ecc7
23-
SIZE (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = 62316264
24-
SHA256 (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 2268a4bbdf103e66d58229aa522948af25d91507a982d883c9835a8fc4ea869c
25-
SIZE (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 26171668
26-
SHA256 (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 81433410da18557780134ff00dcbf9d1945b8f54cd7051273246cc047761e9a3
27-
SIZE (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 10015380
28-
SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9a45efe873a3862909e5e1252e481b6aef72216b22ad1c317eeaaafa9fdfaf90
29-
SIZE (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 59996448
30-
SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 2e0ab25bfeb0efc5c5aafb753b34b65692c4e87d2083c865f726db5eff9fdf24
31-
SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 24278008
32-
SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 22fdac0eadc5202c7fb0a1268748b793e95897fd5c95545d13e5140df7eda97b
33-
SIZE (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9944700
34-
SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 53d7655656c53d065a108bf57bfbf7be1f7e14f8e1a00be06d2815d35a1375ce
35-
SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 58964296
36-
SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 905ddb832b0e005248c044f603afada55674fe3bceca96ca3212eec2130d9746
37-
SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 24292400
38-
SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = d12e818d9221f1fe9590b0153e018937ba2c90aba081578dc87792605467c839
39-
SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 9617420
40-
SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = e46369a0bbac72a8a931aed5efb71d47c41c135415380fcf06daf9c77dfc7609
41-
SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 60839172
42-
SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = dda78aad0a5b500321b1067afb6f2f423c2a1811c75d8c7a2c54a7498f0d9975
43-
SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 24364400
44-
SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = cf454e20b7d7356f9a08c368d5d00fefc5b4d591e263a57df15d8c5d24d792f8
45-
SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 9978364
46-
SHA256 (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = ca3ab27fd22c1919e9b1c6b0be3db9dfc4571a867db83007f68356ebedc3c08f
47-
SIZE (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 70096420
48-
SHA256 (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 2e3a76771d1281606793f7724521ca7e7019d1a00f1cef3da6bf961348228d27
49-
SIZE (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 24331376
50-
SHA256 (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = a728e4333c602d4bc330964df090f6bd0e3228744f55640595957f9862ba735c
51-
SIZE (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 12483200
1+
TIMESTAMP = 1718102334
2+
SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a
3+
SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512
4+
SHA256 (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 796e9d0ef57403682c2a1f9fc27055fd76a848fea18b2d1eef83c54224539065
5+
SIZE (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 57319612
6+
SHA256 (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 43e7aad140a3bd02cca08f6c45a5baec62d5e099b6e5197703f4bf59d5cc7c5c
7+
SIZE (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 25417584
8+
SHA256 (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 0bf819a3eab9ec60b8a797d2c90c157135e7002502c3326c211003d6b5d1f696
9+
SIZE (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 8816768
10+
SHA256 (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 24c92fea05a48a16fa647c4eb79cca551b95066065ba9bcf1a41a70de418584e
11+
SIZE (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 46716800
12+
SHA256 (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = dc31c98b26cafc76346f3dba949727a11f930fd8a543b136d845759d4b8a4c7b
13+
SIZE (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = 26202124
14+
SHA256 (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = b6eeab7031c134dad1db61551be597b463d4eb7ceb4860fcf5a83968d8c2f161
15+
SIZE (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = 9871768
16+
SHA256 (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 948cc2d0952f38315bc9d68c4f5d1bdde7f741fb56a9648a6810faf57c2c67a7
17+
SIZE (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 57684964
18+
SHA256 (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = bb9bdf1fb8dfcd7a94ddd85cacb7d01f95b9855ab1bbaf99edaa7195c04740ff
19+
SIZE (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = 24903216
20+
SHA256 (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 2ac46611d5a150a243dbc303fb1e5375ef0663afa724f2bdfffa915f8c0e9a4a
21+
SIZE (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 8884760
22+
SHA256 (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 38b501d5b02abb94cb40c4738e01389fb6a086fc3426aee59fb9f918222ec779
23+
SIZE (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 64399464
24+
SHA256 (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 53e03241d71df0db0440c716dce8d43e42b9a1ed319fbc468a3b2d0bd03676b2
25+
SIZE (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 26038480
26+
SHA256 (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = f75b1d7f45736a5d048e4b68e41bbe986f3f414fd8be0eb2d116133868ddb110
27+
SIZE (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = 10154936
28+
SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = dbe7c32f49be34098eb1199e3ce2e3cef748fc0a7339448aa258c7f4e41f9d1a
29+
SIZE (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = 61054892
30+
SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = f130932c829c88064b89de7b511cacfa4d49273339a325e73f4f83b55592a764
31+
SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = 24067100
32+
SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 76b93267895bf2f6fc24c6b46e68a6593a8d065545b0d46afeaddb4f9eda5615
33+
SIZE (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 9564996
34+
SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = dac918f38b284d62eca95df2b29bbfb6eb6c8e8419bf57ac669f8b181def737a
35+
SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 59532620
36+
SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9eebd51b38a3a24ae57cec39b7368c2c1b30fc67c8d651d0829a752976d49158
37+
SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24058796
38+
SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24ee0edbed6147aedd7d0d7d5f10774c59b3eefeabdbb20adca826ab79a7b608
39+
SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9137688
40+
SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = a9e26efd3362b129d2002d6a629bc94abeadc721a776192887e13af78fd35738
41+
SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 60918936
42+
SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 00a49af7bc1dc16ec18eec34b71055d6d42923220569c06d27ed3b5e0e5c4589
43+
SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 24168348
44+
SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 79b6a00f2ea9fb88506dfefb057bd9b8abdbb01f9cf2fefe7c1dc3f146d9edc3
45+
SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 9372912
46+
SHA256 (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 21f1e2f76501717810043e907ca7192447f010a0562d9a52253176a8655b3cf5
47+
SIZE (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 76153676
48+
SHA256 (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 73d1645a06c4f2f8ad2462ba04878f6b8f0b7d93da1e562b4428a5e23c34cefb
49+
SIZE (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 24204228
50+
SHA256 (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = b547ef7ae9d701b9bc618165f9882e3e40d2db74f6cb70a12a4b6b4ebaf2b414
51+
SIZE (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 13083732

‎lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎lang/rust/files/patch-vendor_cc.rs‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
When the compiler has "clang" in its name the cc crate will pass
2+
an LLVM target triple to it. Rust uses a triple that lacks the OS
3+
version and LLVM will default to FreeBSD 9 behavior, i.e., it will
4+
default to libstdc++ which is no longer available in newer releases.
5+
6+
To avoid this issue assume we have a GNU compatible toolchain instead
7+
until LLVM can be updated to use libc++ by default.
8+
9+
https://reviews.llvm.org/D77776
10+
11+
--- vendor/cc-1.0.73/src/lib.rs.orig 2021-03-04 20:58:54 UTC
12+
+++ vendor/cc-1.0.73/src/lib.rs
13+
@@ -2659,24 +2659,7 @@ impl Tool {
14+
}
15+
16+
fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
17+
- // Try to detect family of the tool from its name, falling back to Gnu.
18+
- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
19+
- if fname.contains("clang-cl") {
20+
- ToolFamily::Msvc { clang_cl: true }
21+
- } else if fname.ends_with("cl") || fname == "cl.exe" {
22+
- ToolFamily::Msvc { clang_cl: false }
23+
- } else if fname.contains("clang") {
24+
- match clang_driver {
25+
- Some("cl") => ToolFamily::Msvc { clang_cl: true },
26+
- _ => ToolFamily::Clang,
27+
- }
28+
- } else {
29+
- ToolFamily::Gnu
30+
- }
31+
- } else {
32+
- ToolFamily::Gnu
33+
- };
34+
-
35+
+ let family = ToolFamily::Gnu;
36+
Tool {
37+
path: path,
38+
cc_wrapper_path: None,
39+
40+
--- vendor/cc-1.0.79/src/lib.rs.orig 2021-03-04 20:58:54 UTC
41+
+++ vendor/cc-1.0.79/src/lib.rs
42+
@@ -2659,24 +2659,7 @@ impl Tool {
43+
}
44+
45+
fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
46+
- // Try to detect family of the tool from its name, falling back to Gnu.
47+
- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
48+
- if fname.contains("clang-cl") {
49+
- ToolFamily::Msvc { clang_cl: true }
50+
- } else if fname.ends_with("cl") || fname == "cl.exe" {
51+
- ToolFamily::Msvc { clang_cl: false }
52+
- } else if fname.contains("clang") {
53+
- match clang_driver {
54+
- Some("cl") => ToolFamily::Msvc { clang_cl: true },
55+
- _ => ToolFamily::Clang,
56+
- }
57+
- } else {
58+
- ToolFamily::Gnu
59+
- }
60+
- } else {
61+
- ToolFamily::Gnu
62+
- };
63+
-
64+
+ let family = ToolFamily::Gnu;
65+
Tool {
66+
path: path,
67+
cc_wrapper_path: None,
68+
69+
--- vendor/cc-1.0.90/src/tool.rs.orig 2024-03-18 11:23:17 UTC
70+
+++ vendor/cc-1.0.90/src/tool.rs
71+
@@ -122,22 +122,7 @@ impl Tool {
72+
};
73+
74+
// Try to detect family of the tool from its name, falling back to Gnu.
75+
- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
76+
- if fname.contains("clang-cl") {
77+
- ToolFamily::Msvc { clang_cl: true }
78+
- } else if fname.ends_with("cl") || fname == "cl.exe" {
79+
- ToolFamily::Msvc { clang_cl: false }
80+
- } else if fname.contains("clang") {
81+
- match clang_driver {
82+
- Some("cl") => ToolFamily::Msvc { clang_cl: true },
83+
- _ => ToolFamily::Clang,
84+
- }
85+
- } else {
86+
- detect_family(&path)
87+
- }
88+
- } else {
89+
- detect_family(&path)
90+
- };
91+
+ let family = ToolFamily::Gnu;
92+
93+
Tool {
94+
path,
95+
--- vendor/cc-1.0.92/src/tool.rs.orig 2024-05-09 18:20:47 UTC
96+
+++ vendor/cc-1.0.92/src/tool.rs
97+
@@ -151,9 +151,7 @@ impl Tool {
98+
99+
match (clang, accepts_cl_style_flags, gcc) {
100+
(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
101+
- (true, false, _) => Ok(ToolFamily::Clang {
102+
- zig_cc: is_zig_cc(path, cargo_output),
103+
- }),
104+
+ (true, false, _) => Ok(ToolFamily::Gnu),
105+
(false, false, true) => Ok(ToolFamily::Gnu),
106+
(false, false, false) => {
107+
cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");

0 commit comments

Comments
 (0)