rust: update to 1.26.0.
[ci skip] Closes #14304. Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
parent
260ad15285
commit
f60a28098e
2 changed files with 17 additions and 16 deletions
|
@ -1,9 +1,9 @@
|
|||
--- rustc-1.25.0-src/src/bootstrap/compile.rs 2018-03-25 16:26:14.000000000 +0200
|
||||
+++ rustc-1.25.0-src/src/bootstrap/compile.rs 2018-03-28 18:31:04.332764856 +0200
|
||||
@@ -78,13 +78,6 @@
|
||||
@@ -79,13 +79,6 @@
|
||||
});
|
||||
println!("Uplifting stage1 std ({} -> {})", from.host, target);
|
||||
|
||||
|
||||
- // Even if we're not building std this stage, the new sysroot must
|
||||
- // still contain the musl startup objects.
|
||||
- if target.contains("musl") {
|
||||
|
@ -14,22 +14,22 @@
|
|||
builder.ensure(StdLink {
|
||||
compiler: from,
|
||||
target_compiler: compiler,
|
||||
@@ -97,11 +90,6 @@
|
||||
println!("Building stage{} std artifacts ({} -> {})", compiler.stage,
|
||||
&compiler.host, target);
|
||||
|
||||
@@ -94,11 +87,6 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- if target.contains("musl") {
|
||||
- let libdir = builder.sysroot_libdir(compiler, target);
|
||||
- copy_musl_third_party_objects(build, target, &libdir);
|
||||
- }
|
||||
-
|
||||
let out_dir = build.stage_out(compiler, Mode::Libstd);
|
||||
let out_dir = build.cargo_out(compiler, Mode::Libstd, target);
|
||||
build.clear_if_dirty(&out_dir, &builder.rustc(compiler));
|
||||
let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build");
|
||||
@@ -119,19 +107,6 @@
|
||||
@@ -120,20 +108,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-/// Copies the crt(1,i,n).o startup objects
|
||||
-///
|
||||
-/// Since musl supports fully static linking, we can cross link for it even
|
||||
|
@ -43,9 +43,10 @@
|
|||
- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj));
|
||||
- }
|
||||
-}
|
||||
|
||||
-
|
||||
/// Configure cargo to compile the standard library, adding appropriate env vars
|
||||
/// and such.
|
||||
pub fn std_cargo(build: &Builder,
|
||||
|
||||
--- rustc-1.25.0-src-orig/src/bootstrap/sanity.rs 2018-03-25 16:26:14.000000000 +0200
|
||||
+++ rustc-1.25.0-src/src/bootstrap/sanity.rs 2018-03-29 12:49:49.192705213 +0200
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
# Template file for 'rust'
|
||||
pkgname=rust
|
||||
version=1.25.0
|
||||
version=1.26.0
|
||||
revision=1
|
||||
_rust_dist_version=1.25.0
|
||||
_cargo_dist_version=0.25.0
|
||||
_cargo_dist_version=0.26.0
|
||||
# NB. if you push any(!) new version, don't forget to put a build
|
||||
# output of musl to https://repo.voidlinux.eu/distfiles/
|
||||
wrksrc="rustc-${version}-src"
|
||||
|
@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
|
|||
homepage="http://www.rust-lang.org/"
|
||||
license="MIT, Apache-2.0"
|
||||
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
|
||||
checksum=eef63a0aeea5147930a366aee78cbde248bb6e5c6868801bdf34849152965d2d
|
||||
checksum=4fb09bc4e233b71dcbe08a37a3f38cabc32219745ec6a628b18a55a1232281dd
|
||||
|
||||
case "$XBPS_MACHINE" in
|
||||
x86_64-musl)
|
||||
|
@ -31,7 +31,7 @@ x86_64-musl)
|
|||
checksum+="
|
||||
f70810658e111e22a48562f3a0e658c6a89427e2dc9f0d01079df7d81c1a5d84
|
||||
3dcb3ce1a0972ab637062f9556f269a00cb2e9f537a1ca02314d5090373795b3
|
||||
b909608608b36cd75f63f7aab1efb31f3eb50a1f0744151474ebc9559f721bdd"
|
||||
406a348567577cb2859749f1b1e1a843de20e7c1f305de89d3a3760635c4979e"
|
||||
;;
|
||||
x86_64)
|
||||
# extract from src/stage0.txt
|
||||
|
@ -42,7 +42,7 @@ x86_64)
|
|||
checksum+="
|
||||
f8f4ae2f4b76416bfa90758267df4280dd078235dfba92dac0431595493443be
|
||||
a3258308e3a9fe364d63b5d782efb285ab410bdfc01d168c119122ddbc9a02e2
|
||||
9cad9675f7e48d7792b931d662031c6b9f6b834b048108be3615eac38ef5303a"
|
||||
aeaa5813aa6615dd7fdde6d870ca257c5b2e9da5e308f8242a08b231605bce0e"
|
||||
;;
|
||||
i686)
|
||||
# extract from src/stage0.txt
|
||||
|
@ -53,7 +53,7 @@ i686)
|
|||
checksum+="
|
||||
12d056e4e2aecb67f1aed3e045c9c07e9ba7449bc9f39f3d66b5c256fb8c397f
|
||||
407318bad891e2e2ca8e35f1be97a4cf70b76e4c7ce8b4e838048bfabea26acb
|
||||
7f06f92a3013d2f54be69ccaa148979bf5d6e95b57d3c48981b28b0b3feb78d3"
|
||||
bc5f5aa32d2f4ba26abf79a900231d06eecc7f1f2e125ed51bf71766550d1879"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
Loading…
Reference in a new issue