diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-05-04 04:24:59 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-05-04 04:24:59 +0000 |
| commit | 5202a56eff0270f2f8495e4fcda9eb4c8fd1d0c9 (patch) | |
| tree | 5a4f976dc05128dc3eec1cebc5773ba499e5c462 /lang/rust-nightly | |
| parent | 4f3b15e0bb2246e1a0a91ef57dacfc6422acfae2 (diff) | |
| download | ports-5202a56eff0270f2f8495e4fcda9eb4c8fd1d0c9.tar.gz ports-5202a56eff0270f2f8495e4fcda9eb4c8fd1d0c9.zip | |
Notes
Diffstat (limited to 'lang/rust-nightly')
| -rw-r--r-- | lang/rust-nightly/Makefile | 2 | ||||
| -rw-r--r-- | lang/rust-nightly/distinfo | 6 | ||||
| -rw-r--r-- | lang/rust-nightly/files/patch-src_bootstrap_native.rs | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index f98357f32160..294fb743af3b 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -18,7 +18,7 @@ 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-04-27 +NIGHTLY_DATE= 2020-05-04 # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2020-04-22 diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 1d2fcbea94c6..ae0ac0db9d85 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1587959847 -SHA256 (rust/2020-04-27/rustc-nightly-src.tar.xz) = 8d72e08ff6920178860eeb32741a8eff129a402150772a1c6696e765597b27d4 -SIZE (rust/2020-04-27/rustc-nightly-src.tar.xz) = 94780700 +TIMESTAMP = 1588565873 +SHA256 (rust/2020-05-04/rustc-nightly-src.tar.xz) = e109d5ac1a3b5dd626cd3818f75b0443695e72ace986260c51b9c76a230909c6 +SIZE (rust/2020-05-04/rustc-nightly-src.tar.xz) = 94842712 SHA256 (rust/2020-04-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 502b41362ba46e37dbf7c890b76e8b420d156f998bbf96f545e0ce68ce5a5ad6 SIZE (rust/2020-04-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 36152976 SHA256 (rust/2020-04-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 3919d86ce0f932d22f69670e3e353a9b5cc9463ed586ea52406b311fb270941e diff --git a/lang/rust-nightly/files/patch-src_bootstrap_native.rs b/lang/rust-nightly/files/patch-src_bootstrap_native.rs index 433833a4a5af..7af832a912d3 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-02-27 18:39:49 UTC +--- src/bootstrap/native.rs.orig 2020-05-03 19:47:59 UTC +++ src/bootstrap/native.rs -@@ -467,25 +467,9 @@ impl Step for Lld { +@@ -488,25 +488,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); @@ -26,9 +26,9 @@ that is only really needed on Windows. - 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) +- .env("LLVM_CONFIG_REAL", &llvm_config) - .define("LLVM_CONFIG_PATH", llvm_config_shim) -+ .define("LLVM_CONFIG_PATH", llvm_config) ++ .define("LLVM_CONFIG_PATH", &llvm_config) .define("LLVM_INCLUDE_TESTS", "OFF"); - cfg.build(); + // While we're using this horrible workaround to shim the execution of |