Skip to content

Commit 5dfcd85

Browse files
borsbors
committed
Auto merge of #42105 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 17 pull requests - Successful merges: #41870, #41910, #41958, #41971, #42006, #42024, #42037, #42056, #42067, #42070, #42079, #42080, #42082, #42089, #42092, #42096, #42100 - Failed merges:
2 parents 543691d + 040cd6d commit 5dfcd85

File tree

71 files changed

+947
-513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+947
-513
lines changed

‎src/bootstrap/bootstrap.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,14 @@ def run(self, args, env=None, cwd=None):
398398
sys.exit(ret)
399399

400400
def output(self, args, env=None, cwd=None):
401+
default_encoding = sys.getdefaultencoding()
401402
proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env, cwd=cwd)
402403
(out, err) = proc.communicate()
403404
ret = proc.wait()
404405
if ret != 0:
405406
print(out)
406407
sys.exit(ret)
407-
return out
408+
return out.decode(default_encoding)
408409

409410
def build_triple(self):
410411
default_encoding = sys.getdefaultencoding()
@@ -570,10 +571,10 @@ def update_submodules(self):
570571

571572
for submod in submodules:
572573
path, status = submod
573-
if path.endswith(b"llvm") and \
574+
if path.endswith('llvm') and \
574575
(self.get_toml('llvm-config') or self.get_mk('CFG_LLVM_ROOT')):
575576
continue
576-
if path.endswith(b"jemalloc") and \
577+
if path.endswith('jemalloc') and \
577578
(self.get_toml('jemalloc') or self.get_mk('CFG_JEMALLOC_ROOT')):
578579
continue
579580
submod_path = os.path.join(self.rust_root, path)

‎src/bootstrap/install.rs

+98-71
Original file line numberDiff line numberDiff line change
@@ -21,83 +21,110 @@ use std::process::Command;
2121
use Build;
2222
use dist::{sanitize_sh, tmpdir};
2323

24-
/// Installs everything.
25-
pub fn install(build: &Build, stage: u32, host: &str) {
26-
let prefix_default = PathBuf::from("/usr/local");
27-
let sysconfdir_default = PathBuf::from("/etc");
28-
let docdir_default = PathBuf::from("share/doc/rust");
29-
let bindir_default = PathBuf::from("bin");
30-
let libdir_default = PathBuf::from("lib");
31-
let mandir_default = PathBuf::from("share/man");
32-
let prefix = build.config.prefix.as_ref().unwrap_or(&prefix_default);
33-
let sysconfdir = build.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
34-
let docdir = build.config.docdir.as_ref().unwrap_or(&docdir_default);
35-
let bindir = build.config.bindir.as_ref().unwrap_or(&bindir_default);
36-
let libdir = build.config.libdir.as_ref().unwrap_or(&libdir_default);
37-
let mandir = build.config.mandir.as_ref().unwrap_or(&mandir_default);
38-
39-
let sysconfdir = prefix.join(sysconfdir);
40-
let docdir = prefix.join(docdir);
41-
let bindir = prefix.join(bindir);
42-
let libdir = prefix.join(libdir);
43-
let mandir = prefix.join(mandir);
44-
45-
let destdir = env::var_os("DESTDIR").map(PathBuf::from);
46-
47-
let prefix = add_destdir(&prefix, &destdir);
48-
let sysconfdir = add_destdir(&sysconfdir, &destdir);
49-
let docdir = add_destdir(&docdir, &destdir);
50-
let bindir = add_destdir(&bindir, &destdir);
51-
let libdir = add_destdir(&libdir, &destdir);
52-
let mandir = add_destdir(&mandir, &destdir);
53-
54-
let empty_dir = build.out.join("tmp/empty_dir");
55-
t!(fs::create_dir_all(&empty_dir));
56-
if build.config.docs {
57-
install_sh(&build, "docs", "rust-docs", &build.rust_package_vers(),
58-
stage, host, &prefix, &sysconfdir, &docdir, &bindir, &libdir,
59-
&mandir, &empty_dir);
60-
}
24+
pub struct Installer<'a> {
25+
build: &'a Build,
26+
prefix: PathBuf,
27+
sysconfdir: PathBuf,
28+
docdir: PathBuf,
29+
bindir: PathBuf,
30+
libdir: PathBuf,
31+
mandir: PathBuf,
32+
}
6133

62-
for target in build.config.target.iter() {
63-
install_sh(&build, "std", "rust-std", &build.rust_package_vers(),
64-
stage, target, &prefix, &sysconfdir, &docdir, &bindir, &libdir,
65-
&mandir, &empty_dir);
66-
}
34+
impl<'a> Installer<'a> {
35+
pub fn new(build: &'a Build) -> Installer<'a> {
36+
let prefix_default = PathBuf::from("/usr/local");
37+
let sysconfdir_default = PathBuf::from("/etc");
38+
let docdir_default = PathBuf::from("share/doc/rust");
39+
let bindir_default = PathBuf::from("bin");
40+
let libdir_default = PathBuf::from("lib");
41+
let mandir_default = PathBuf::from("share/man");
42+
let prefix = build.config.prefix.as_ref().unwrap_or(&prefix_default);
43+
let sysconfdir = build.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
44+
let docdir = build.config.docdir.as_ref().unwrap_or(&docdir_default);
45+
let bindir = build.config.bindir.as_ref().unwrap_or(&bindir_default);
46+
let libdir = build.config.libdir.as_ref().unwrap_or(&libdir_default);
47+
let mandir = build.config.mandir.as_ref().unwrap_or(&mandir_default);
48+
49+
let sysconfdir = prefix.join(sysconfdir);
50+
let docdir = prefix.join(docdir);
51+
let bindir = prefix.join(bindir);
52+
let libdir = prefix.join(libdir);
53+
let mandir = prefix.join(mandir);
54+
55+
let destdir = env::var_os("DESTDIR").map(PathBuf::from);
6756

68-
if build.config.extended {
69-
install_sh(&build, "cargo", "cargo", &build.cargo_package_vers(),
70-
stage, host, &prefix, &sysconfdir, &docdir, &bindir, &libdir,
71-
&mandir, &empty_dir);
72-
install_sh(&build, "rls", "rls", &build.rls_package_vers(),
73-
stage, host, &prefix, &sysconfdir, &docdir, &bindir, &libdir,
74-
&mandir, &empty_dir);
57+
let prefix = add_destdir(&prefix, &destdir);
58+
let sysconfdir = add_destdir(&sysconfdir, &destdir);
59+
let docdir = add_destdir(&docdir, &destdir);
60+
let bindir = add_destdir(&bindir, &destdir);
61+
let libdir = add_destdir(&libdir, &destdir);
62+
let mandir = add_destdir(&mandir, &destdir);
63+
64+
Installer {
65+
build,
66+
prefix,
67+
sysconfdir,
68+
docdir,
69+
bindir,
70+
libdir,
71+
mandir,
72+
}
7573
}
7674

77-
install_sh(&build, "rustc", "rustc", &build.rust_package_vers(),
78-
stage, host, &prefix, &sysconfdir, &docdir, &bindir, &libdir,
79-
&mandir, &empty_dir);
75+
/// Installs everything.
76+
pub fn install(&self, stage: u32, host: &str) {
77+
let empty_dir = self.build.out.join("tmp/empty_dir");
78+
t!(fs::create_dir_all(&empty_dir));
8079

81-
t!(fs::remove_dir_all(&empty_dir));
82-
}
80+
if self.build.config.docs {
81+
self.install_sh("docs", "rust-docs", &self.build.rust_package_vers(),
82+
stage, Some(host), &empty_dir);
83+
}
8384

84-
fn install_sh(build: &Build, package: &str, name: &str, version: &str, stage: u32, host: &str,
85-
prefix: &Path, sysconfdir: &Path, docdir: &Path, bindir: &Path, libdir: &Path,
86-
mandir: &Path, empty_dir: &Path) {
87-
println!("Install {} stage{} ({})", package, stage, host);
88-
let package_name = format!("{}-{}-{}", name, version, host);
89-
90-
let mut cmd = Command::new("sh");
91-
cmd.current_dir(empty_dir)
92-
.arg(sanitize_sh(&tmpdir(build).join(&package_name).join("install.sh")))
93-
.arg(format!("--prefix={}", sanitize_sh(prefix)))
94-
.arg(format!("--sysconfdir={}", sanitize_sh(sysconfdir)))
95-
.arg(format!("--docdir={}", sanitize_sh(docdir)))
96-
.arg(format!("--bindir={}", sanitize_sh(bindir)))
97-
.arg(format!("--libdir={}", sanitize_sh(libdir)))
98-
.arg(format!("--mandir={}", sanitize_sh(mandir)))
99-
.arg("--disable-ldconfig");
100-
build.run(&mut cmd);
85+
for target in self.build.config.target.iter() {
86+
self.install_sh("std", "rust-std", &self.build.rust_package_vers(),
87+
stage, Some(target), &empty_dir);
88+
}
89+
90+
if self.build.config.extended {
91+
self.install_sh("cargo", "cargo", &self.build.cargo_package_vers(),
92+
stage, Some(host), &empty_dir);
93+
self.install_sh("rls", "rls", &self.build.rls_package_vers(),
94+
stage, Some(host), &empty_dir);
95+
self.install_sh("analysis", "rust-analysis", &self.build.rust_package_vers(),
96+
stage, Some(host), &empty_dir);
97+
self.install_sh("src", "rust-src", &self.build.rust_package_vers(),
98+
stage, None, &empty_dir);
99+
}
100+
101+
self.install_sh("rustc", "rustc", &self.build.rust_package_vers(),
102+
stage, Some(host), &empty_dir);
103+
104+
t!(fs::remove_dir_all(&empty_dir));
105+
}
106+
107+
fn install_sh(&self, package: &str, name: &str, version: &str,
108+
stage: u32, host: Option<&str>, empty_dir: &Path) {
109+
println!("Install {} stage{} ({:?})", package, stage, host);
110+
let package_name = if let Some(host) = host {
111+
format!("{}-{}-{}", name, version, host)
112+
} else {
113+
format!("{}-{}", name, version)
114+
};
115+
116+
let mut cmd = Command::new("sh");
117+
cmd.current_dir(empty_dir)
118+
.arg(sanitize_sh(&tmpdir(self.build).join(&package_name).join("install.sh")))
119+
.arg(format!("--prefix={}", sanitize_sh(&self.prefix)))
120+
.arg(format!("--sysconfdir={}", sanitize_sh(&self.sysconfdir)))
121+
.arg(format!("--docdir={}", sanitize_sh(&self.docdir)))
122+
.arg(format!("--bindir={}", sanitize_sh(&self.bindir)))
123+
.arg(format!("--libdir={}", sanitize_sh(&self.libdir)))
124+
.arg(format!("--mandir={}", sanitize_sh(&self.mandir)))
125+
.arg("--disable-ldconfig");
126+
self.build.run(&mut cmd);
127+
}
101128
}
102129

103130
fn add_destdir(path: &Path, destdir: &Option<PathBuf>) -> PathBuf {

‎src/bootstrap/step.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
761761
.run(move |s| dist::rls(build, s.stage, s.target));
762762
rules.dist("install", "path/to/nowhere")
763763
.dep(|s| s.name("default:dist"))
764-
.run(move |s| install::install(build, s.stage, s.target));
764+
.run(move |s| install::Installer::new(build).install(s.stage, s.target));
765765
rules.dist("dist-cargo", "cargo")
766766
.host(true)
767767
.only_host_build(true)

‎src/ci/docker/README.md

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ for example:
1616

1717
Images will output artifacts in an `obj` dir at the root of a repository.
1818

19+
## Filesystem layout
20+
21+
- Each directory, excluding `scripts` and `disabled`, corresponds to a docker image
22+
- `scripts` contains files shared by docker images
23+
- `disabled` contains images that are not build travis
24+
1925
## Cross toolchains
2026

2127
A number of these images take quite a long time to compile as they're building

‎src/ci/docker/arm-android/Dockerfile

+33-37
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,44 @@ FROM ubuntu:16.04
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \
5+
ca-certificates \
6+
cmake \
7+
curl \
8+
file \
59
g++ \
10+
git \
11+
libssl-dev \
612
make \
7-
file \
8-
curl \
9-
ca-certificates \
13+
pkg-config \
1014
python2.7 \
11-
git \
12-
cmake \
13-
unzip \
1415
sudo \
15-
xz-utils \
16-
libssl-dev \
17-
pkg-config
18-
19-
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
20-
dpkg -i dumb-init_*.deb && \
21-
rm dumb-init_*.deb
16+
unzip \
17+
xz-utils
2218

23-
RUN curl -o /usr/local/bin/sccache \
24-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \
25-
chmod +x /usr/local/bin/sccache
19+
# dumb-init
20+
COPY scripts/dumb-init.sh /scripts/
21+
RUN sh /scripts/dumb-init.sh
2622

27-
# Install NDK
28-
COPY install-ndk.sh /tmp
29-
RUN . /tmp/install-ndk.sh && \
30-
download_ndk android-ndk-r13b-linux-x86_64.zip && \
31-
make_standalone_toolchain arm 9 && \
32-
remove_ndk
23+
# ndk
24+
COPY scripts/android-ndk.sh /scripts/
25+
RUN . /scripts/android-ndk.sh && \
26+
download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9
3327

34-
# Install SDK
28+
# sdk
3529
RUN dpkg --add-architecture i386 && \
3630
apt-get update && \
3731
apt-get install -y --no-install-recommends \
38-
openjdk-9-jre-headless \
39-
tzdata \
40-
libstdc++6:i386 \
4132
libgl1-mesa-glx \
42-
libpulse0
33+
libpulse0 \
34+
libstdc++6:i386 \
35+
openjdk-9-jre-headless \
36+
tzdata
4337

44-
COPY install-sdk.sh /tmp
45-
RUN . /tmp/install-sdk.sh && \
46-
download_sdk tools_r25.2.5-linux.zip && \
47-
download_sysimage armeabi-v7a 18 && \
48-
create_avd armeabi-v7a 18
38+
COPY scripts/android-sdk.sh /scripts/
39+
RUN . /scripts/android-sdk.sh && \
40+
download_and_create_avd tools_r25.2.5-linux.zip armeabi-v7a 18
4941

50-
# Setup env
42+
# env
5143
ENV PATH=$PATH:/android/sdk/tools
5244
ENV PATH=$PATH:/android/sdk/platform-tools
5345

@@ -57,8 +49,12 @@ ENV RUST_CONFIGURE_ARGS \
5749
--target=$TARGETS \
5850
--arm-linux-androideabi-ndk=/android/ndk/arm-9
5951

60-
ENV SCRIPT python2.7 ../x.py test --target $TARGETS --verbose
52+
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
53+
54+
# sccache
55+
COPY scripts/sccache.sh /scripts/
56+
RUN sh /scripts/sccache.sh
6157

62-
# Entrypoint
63-
COPY start-emulator.sh /android/
64-
ENTRYPOINT ["/usr/bin/dumb-init", "--", "/android/start-emulator.sh"]
58+
# init
59+
COPY scripts/android-start-emulator.sh /scripts/
60+
ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"]

‎src/ci/docker/arm-android/install-ndk.sh

-35
This file was deleted.

‎src/ci/docker/armhf-gnu/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ WORKDIR /build
3131
# The `vexpress_config` config file was a previously generated config file for
3232
# the kernel. This file was generated by running `make vexpress_defconfig`
3333
# followed by `make menuconfig` and then enabling the IPv6 protocol page.
34-
COPY vexpress_config /build/.config
34+
COPY armhf-gnu/vexpress_config /build/.config
3535
RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.42.tar.xz | \
3636
tar xJf - && \
3737
cd /build/linux-4.4.42 && \
@@ -63,11 +63,11 @@ RUN curl http://cdimage.ubuntu.com/ubuntu-base/releases/16.04/release/ubuntu-bas
6363

6464
# Copy over our init script, which starts up our test server and also a few
6565
# other misc tasks.
66-
COPY rcS rootfs/etc/init.d/rcS
66+
COPY armhf-gnu/rcS rootfs/etc/init.d/rcS
6767
RUN chmod +x rootfs/etc/init.d/rcS
6868

6969
# Helper to quickly fill the entropy pool in the kernel.
70-
COPY addentropy.c /tmp/
70+
COPY armhf-gnu/addentropy.c /tmp/
7171
RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7272

7373
# TODO: What is this?!

‎src/ci/docker/cross/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
3232

3333
WORKDIR /tmp
3434

35-
COPY build-rumprun.sh /tmp/
35+
COPY cross/build-rumprun.sh /tmp/
3636
RUN ./build-rumprun.sh
3737

38-
COPY build-arm-musl.sh /tmp/
38+
COPY cross/build-arm-musl.sh /tmp/
3939
RUN ./build-arm-musl.sh
4040

4141
# originally from

0 commit comments

Comments
 (0)