Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 567383) +++ head/lang/rust-nightly/Makefile (revision 567384) @@ -1,28 +1,28 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.50.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo # Get latest from top level 'date' key in # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2021-02-12 +NIGHTLY_DATE= 2021-03-05 # See WRKSRC/src/stage0.txt for this date -BOOTSTRAPS_DATE= 2020-12-30 +BOOTSTRAPS_DATE= 2021-02-14 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 567383) +++ head/lang/rust-nightly/distinfo (revision 567384) @@ -1,9 +1,9 @@ -TIMESTAMP = 1613114410 -SHA256 (rust/2021-02-12/rustc-nightly-src.tar.xz) = 6f3f451d02460a108014e1f639f10f78c98a00864a4afbe8ba05b90f6f716a54 -SIZE (rust/2021-02-12/rustc-nightly-src.tar.xz) = 109753924 -SHA256 (rust/2020-12-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 1350d6ca6dfea5b87dec31fa980b26397f81c135c04b488766efc511845f74bd -SIZE (rust/2020-12-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 79072020 -SHA256 (rust/2020-12-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 6bb842028d940676e68756c3391736e7b71da239fcdadc01f34042ad6a69463a -SIZE (rust/2020-12-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 25098800 -SHA256 (rust/2020-12-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 2e087d04a75bc55ccaa9fa6d2ff97aa79873c4bd2a718ef11ff14ebbc128749e -SIZE (rust/2020-12-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6265016 +TIMESTAMP = 1614940829 +SHA256 (rust/2021-03-05/rustc-nightly-src.tar.xz) = 53a31c16c0b119fddcace0aa7d57e107a8e21b40d4d04b976ddcb363f0273fce +SIZE (rust/2021-03-05/rustc-nightly-src.tar.xz) = 114645532 +SHA256 (rust/2021-02-14/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 1eb1f1508887449de36aa0dc75e549b8185d7d0bd4f86d503adda09295397fb7 +SIZE (rust/2021-02-14/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 79211584 +SHA256 (rust/2021-02-14/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f366210bf594eda2b3a6547aff7fb0f32cde99e1a0ec427d2a05a430cc9795b2 +SIZE (rust/2021-02-14/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 25348664 +SHA256 (rust/2021-02-14/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 1cd82e9ea763ad75b094043b0604c606222015f981fbf0d8c05c541d2b145939 +SIZE (rust/2021-02-14/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6252112 Index: head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs =================================================================== --- head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs (revision 567383) +++ head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs (revision 567384) @@ -1,42 +1,38 @@ When the compiler has "clang" in its name the cc crate will pass an LLVM target triple to it. Rust uses a triple that lacks the OS version and LLVM will default to FreeBSD 9 behavior, i.e., it will default to libstdc++ which is no longer available in newer releases. To avoid this issue assume we have a GNU compatible toolchain instead until LLVM can be updated to use libc++ by default. https://reviews.llvm.org/D77776 ---- vendor/cc/src/lib.rs.orig 2020-04-14 08:55:10 UTC +--- vendor/cc/src/lib.rs.orig 2021-03-04 20:58:54 UTC +++ vendor/cc/src/lib.rs -@@ -2353,28 +2353,7 @@ impl Tool { +@@ -2659,24 +2659,7 @@ impl Tool { } fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { - // Try to detect family of the tool from its name, falling back to Gnu. - let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { - if fname.contains("clang-cl") { - ToolFamily::Msvc { clang_cl: true } -- } else if fname.contains("cl") -- && !fname.contains("cloudabi") -- && !fname.contains("uclibc") -- && !fname.contains("clang") -- { +- } else if fname.ends_with("cl") || fname == "cl.exe" { - ToolFamily::Msvc { clang_cl: false } - } else if fname.contains("clang") { - match clang_driver { - Some("cl") => ToolFamily::Msvc { clang_cl: true }, - _ => ToolFamily::Clang, - } - } else { - ToolFamily::Gnu - } - } else { - ToolFamily::Gnu - }; - + let family = ToolFamily::Gnu; Tool { path: path, cc_wrapper_path: None,