comlang/rust-nightly: update to 1.38.0.20190907
Changes: 9af17757be...6e19f3f383
This commit is contained in:
@@ -16,7 +16,7 @@ CONFLICTS_INSTALL= rust
|
||||
# Which source to pull:
|
||||
# https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
|
||||
# https://static.rust-lang.org/dist/channel-rust-nightly.toml
|
||||
NIGHTLY_DATE= 2019-09-03
|
||||
NIGHTLY_DATE= 2019-09-07
|
||||
NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/
|
||||
|
||||
# See WRKSRC/src/stage0.txt for this date
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
TIMESTAMP = 1567445447
|
||||
SHA256 (rust/2019-09-03/rustc-nightly-src.tar.xz) = 9c3b989938b3fa274e50a4ec6bd98bc5429a76f3d5f3d65bf41f2a02917b5c74
|
||||
SIZE (rust/2019-09-03/rustc-nightly-src.tar.xz) = 94079212
|
||||
TIMESTAMP = 1567796615
|
||||
SHA256 (rust/2019-09-07/rustc-nightly-src.tar.xz) = 2b97cfaac4fa69d743506ce7d4728a62be9f6f65f5a4afe846adcc198f6d47f8
|
||||
SIZE (rust/2019-09-07/rustc-nightly-src.tar.xz) = 94062088
|
||||
SHA256 (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 62117526710b92d1cc00632a6bcf8c1941f5a7d9c1f7a964d7bca55f09786537
|
||||
SIZE (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 49723228
|
||||
SHA256 (rust/2019-08-13/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = c65ef74bebebcf18c9f89c67c16de146c7071e2dffe90effcaf544ff74829d6d
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
Avoid unnecessarily restarting the LLVM build and installing it
|
||||
into STAGEDIR during the install phase.
|
||||
|
||||
https://github.com/rust-lang/rust/issues/61206
|
||||
|
||||
--- src/bootstrap/native.rs.orig 2019-05-22 05:39:52 UTC
|
||||
+++ src/bootstrap/native.rs
|
||||
@@ -92,17 +92,9 @@ impl Step for Llvm {
|
||||
.join(exe("llvm-config", &*builder.config.build));
|
||||
let done_stamp = out_dir.join("llvm-finished-building");
|
||||
|
||||
- if let Some(llvm_commit) = llvm_info.sha() {
|
||||
if done_stamp.exists() {
|
||||
- let done_contents = t!(fs::read(&done_stamp));
|
||||
-
|
||||
- // If LLVM was already built previously and the submodule's commit didn't change
|
||||
- // from the previous build, then no action is required.
|
||||
- if done_contents == llvm_commit.as_bytes() {
|
||||
- return build_llvm_config
|
||||
- }
|
||||
+ return build_llvm_config
|
||||
}
|
||||
- }
|
||||
|
||||
let _folder = builder.fold_output(|| "llvm");
|
||||
let descriptor = if emscripten { "Emscripten " } else { "" };
|
||||
@@ -218,6 +210,10 @@ impl Step for Llvm {
|
||||
}
|
||||
}
|
||||
|
||||
+ if target == "powerpc64-unknown-freebsd" {
|
||||
+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%");
|
||||
+ }
|
||||
+
|
||||
// http://llvm.org/docs/HowToCrossCompileLLVM.html
|
||||
if target != builder.config.build && !emscripten {
|
||||
builder.ensure(Llvm {
|
||||
@@ -283,9 +279,7 @@ impl Step for Llvm {
|
||||
|
||||
cfg.build();
|
||||
|
||||
- if let Some(llvm_commit) = llvm_info.sha() {
|
||||
- t!(fs::write(&done_stamp, llvm_commit));
|
||||
- }
|
||||
+ t!(fs::write(&done_stamp, "done building LLVM"));
|
||||
|
||||
build_llvm_config
|
||||
}
|
||||
Reference in New Issue
Block a user