3 files changed, 21 insertions, 20 deletions

diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index a5cd38913cbd..76e2028348c0 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 # $FreeBSD$
 
-PORTVERSION=	1.46.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.47.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
@@ -18,10 +18,10 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 # Get latest from top level 'date' key in
 # https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=	2020-07-07
+NIGHTLY_DATE=	2020-07-18
 
 # See WRKSRC/src/stage0.txt for this date
-BOOTSTRAPS_DATE=		2020-06-16
+BOOTSTRAPS_DATE=		2020-07-16
 RUST_BOOTSTRAP_VERSION=		beta
 CARGO_BOOTSTRAP_VERSION=	beta
 
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 788b5fc2fe16..a874f1f1de2d 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1594126268
-SHA256 (rust/2020-07-07/rustc-nightly-src.tar.xz) = 3d0f41c5cd1a5ca45f7bddc37d667896ab0be8830be8dba2eb94ac7a4d9710a1
-SIZE (rust/2020-07-07/rustc-nightly-src.tar.xz) = 101883160
-SHA256 (rust/2020-06-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = ffeddcba80de16fef8bcf686e59f1fd9b93319734fb56e010c054aa718e285ac
-SIZE (rust/2020-06-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 40601336
-SHA256 (rust/2020-06-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 6f5598972e9df00629524ee4359229fdf803b1fd1ed45b42f84deb4e3c06a9c8
-SIZE (rust/2020-06-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 15017948
-SHA256 (rust/2020-06-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 33429a39b34557166e10f6eaa171583fb12bea19f557e52e097aae5b64f44fb2
-SIZE (rust/2020-06-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5222388
-SHA256 (rust/2020-06-16/rustc-beta-i686-unknown-freebsd.tar.xz) = 428bb27d978d4474f78e18a62d0fc546a4d50869f0e05bd1ae58e962479bb63f
-SIZE (rust/2020-06-16/rustc-beta-i686-unknown-freebsd.tar.xz) = 41485536
-SHA256 (rust/2020-06-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 6ee5fc50bac944167cdc572c20002e5e7b7200a2511aa841af5d51d42b1558b0
-SIZE (rust/2020-06-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 14922292
-SHA256 (rust/2020-06-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 761958914c5eab339e9ae513328447bd3df22d1c4271d29226da0917ef990326
-SIZE (rust/2020-06-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 5105428
+TIMESTAMP = 1595071324
+SHA256 (rust/2020-07-18/rustc-nightly-src.tar.xz) = dce809f0e142d40d0bf389b21c6dadf1336f0b175c8153462f99a285e33c4688
+SIZE (rust/2020-07-18/rustc-nightly-src.tar.xz) = 102020412
+SHA256 (rust/2020-07-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 423e43d67a25133ddfaa1874c9bd06d690fbfb127e76cbf4323a9564dfd92c26
+SIZE (rust/2020-07-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 42656972
+SHA256 (rust/2020-07-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = ef2c4ef506cb44b6344c7892d9c89beffb2cff81841321a329a3a88299d4bb34
+SIZE (rust/2020-07-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 15203328
+SHA256 (rust/2020-07-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = cca2804f66744b5885b83bc680c8e34089fdf483c03f685e8564a6afebe08eea
+SIZE (rust/2020-07-16/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5224968
+SHA256 (rust/2020-07-16/rustc-beta-i686-unknown-freebsd.tar.xz) = bbc0379710294617c2c6978af65fe468c8a78d45e318cf4accb32a6e42ccd23e
+SIZE (rust/2020-07-16/rustc-beta-i686-unknown-freebsd.tar.xz) = 43099244
+SHA256 (rust/2020-07-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 0c90438aed313acf97a4e306c42af60de1d65aac72bdc8dc97acbc741e949e1b
+SIZE (rust/2020-07-16/rust-std-beta-i686-unknown-freebsd.tar.xz) = 15064244
+SHA256 (rust/2020-07-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 1fa107caeab6328d98b71e0be47f9af02e9586c46d6304a8253b96e7c52faa51
+SIZE (rust/2020-07-16/cargo-beta-i686-unknown-freebsd.tar.xz) = 5093508
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_native.rs b/lang/rust-nightly/files/patch-src_bootstrap_native.rs
index 7af832a912d3..c1469453237d 100644
--- a/lang/rust-nightly/files/patch-src_bootstrap_native.rs
+++ b/lang/rust-nightly/files/patch-src_bootstrap_native.rs
@@ -3,9 +3,9 @@ for building rust-lld.  Attempt to improve reliability of the build
 by not using it.  llvm-config-wrapper is a hack in the first place
 that is only really needed on Windows.
 
---- src/bootstrap/native.rs.orig	2020-05-03 19:47:59 UTC
+--- src/bootstrap/native.rs.orig	2020-07-17 17:26:27 UTC
 +++ src/bootstrap/native.rs
-@@ -488,25 +488,9 @@ impl Step for Lld {
+@@ -542,26 +542,9 @@ impl Step for Lld {
          let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/lld"));
          configure_cmake(builder, target, &mut cfg, true);
  
@@ -24,6 +24,7 @@ that is only really needed on Windows.
 -        // can't build on a system where your paths require `\` on Windows, but
 -        // there's probably a lot of reasons you can't do that other than this.
 -        let llvm_config_shim = env::current_exe().unwrap().with_file_name("llvm-config-wrapper");
+-
          cfg.out_dir(&out_dir)
              .profile("Release")
 -            .env("LLVM_CONFIG_REAL", &llvm_config)