Merge branch 'master' into redox

Author: jackpot51

src/Cargo.lock

@@ -15,7 +15,7 @@
 //! `package_vers`, and otherwise indicating to the compiler what it should
 //! print out as part of its version information.
 
-use std::fs::{self, File};
+use std::fs::File;
 use std::io::prelude::*;
 use std::process::Command;
 
@@ -69,7 +69,7 @@ pub fn collect(build: &mut Build) {
 
  // If we have a git directory, add in some various SHA information of what
  // commit this compiler was compiled from.
- if fs::metadata(build.src.join(".git")).is_ok() {
+ if build.src.join(".git").is_dir() {
  let ver_date = output(Command::new("git").current_dir(&build.src)
  .arg("log").arg("-1")
  .arg("--date=short")

src/bootstrap/channel.rs

@@ -299,6 +299,7 @@ fn markdown_test(build: &Build, compiler: &Compiler, markdown: &Path) {
  build.add_rust_test_threads(&mut cmd);
  cmd.arg("--test");
  cmd.arg(markdown);
+ cmd.env("RUSTC_BOOTSTRAP", "1");
 
  let mut test_args = build.flags.cmd.test_args().join(" ");
  if build.config.quiet_tests {

src/bootstrap/check.rs

@@ -48,6 +48,11 @@ pub fn tmpdir(build: &Build) -> PathBuf {
 /// Slurps up documentation from the `stage`'s `host`.
 pub fn docs(build: &Build, stage: u32, host: &str) {
  println!("Dist docs stage{} ({})", stage, host);
+ if !build.config.docs {
+ println!("\tskipping - docs disabled");
+ return
+ }
+
  let name = format!("rust-docs-{}", package_vers(build));
  let image = tmpdir(build).join(format!("{}-{}-image", name, name));
  let _ = fs::remove_dir_all(&image);
@@ -260,6 +265,14 @@ pub fn debugger_scripts(build: &Build,
 pub fn std(build: &Build, compiler: &Compiler, target: &str) {
  println!("Dist std stage{} ({} -> {})", compiler.stage, compiler.host,
  target);
+
+ // The only true set of target libraries came from the build triple, so
+ // let's reduce redundant work by only producing archives from that host.
+ if compiler.host != build.config.build {
+ println!("\tskipping, not a build host");
+ return
+ }
+
  let name = format!("rust-std-{}", package_vers(build));
  let image = tmpdir(build).join(format!("{}-{}-image", name, target));
  let _ = fs::remove_dir_all(&image);
@@ -294,10 +307,15 @@ pub fn analysis(build: &Build, compiler: &Compiler, target: &str) {
  println!("Dist analysis");
 
  if build.config.channel != "nightly" {
- println!("Skipping dist-analysis - not on nightly channel");
+ println!("\tskipping - not on nightly channel");
  return;
  }
+ if compiler.host != build.config.build {
+ println!("\tskipping - not a build host");
+ return
+ }
  if compiler.stage != 2 {
+ println!("\tskipping - not stage2");
  return
  }
 
@@ -324,13 +342,6 @@ pub fn analysis(build: &Build, compiler: &Compiler, target: &str) {
  .arg("--legacy-manifest-dirs=rustlib,cargo");
  build.run(&mut cmd);
  t!(fs::remove_dir_all(&image));
-
- // Create plain source tarball
- let mut cmd = Command::new("tar");
- cmd.arg("-czf").arg(sanitize_sh(&distdir(build).join(&format!("{}.tar.gz", name))))
- .arg("analysis")
- .current_dir(&src);
- build.run(&mut cmd);
 }
 
 /// Creates the `rust-src` installer component and the plain source tarball

src/bootstrap/dist.rs

@@ -499,7 +499,7 @@ pub fn build_rules(build: &Build) -> Rules {
  .default(true)
  .dep(|s| s.name("default:doc"))
  .run(move |s| dist::docs(build, s.stage, s.target));
- rules.dist("dist-analysis", "src/libstd")
+ rules.dist("dist-analysis", "analysis")
  .dep(|s| s.name("dist-std"))
  .default(true)
  .run(move |s| dist::analysis(build, &s.compiler(), s.target));

src/bootstrap/step.rs

@@ -25,8 +25,13 @@ COPY install-ndk.sh install-sdk.sh accept-licenses.sh /android/
 RUN sh /android/install-ndk.sh
 RUN sh /android/install-sdk.sh
 
+RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
+ dpkg -i dumb-init_*.deb && \
+ rm dumb-init_*.deb
+
 COPY start-emulator.sh /android/
-ENTRYPOINT ["/android/start-emulator.sh"]
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--", "/android/start-emulator.sh"]
 
 ENV TARGETS=arm-linux-androideabi
 ENV TARGETS=$TARGETS,i686-linux-android

src/ci/docker/arm-android/Dockerfile

@@ -23,6 +23,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
  gcc-s390x-linux-gnu libc6-dev-s390x-cross
 
+RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
+ dpkg -i dumb-init_*.deb && \
+ rm dumb-init_*.deb
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
 ENV TARGETS=aarch64-unknown-linux-gnu
 ENV TARGETS=$TARGETS,arm-unknown-linux-gnueabi
 ENV TARGETS=$TARGETS,arm-unknown-linux-gnueabihf

src/ci/docker/cross/Dockerfile

@@ -13,6 +13,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  sudo \
  gdb
 
+RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
+ dpkg -i dumb-init_*.deb && \
+ rm dumb-init_*.deb
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
 ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
 ENV RUST_CHECK_TARGET check
 RUN mkdir /tmp/obj

src/ci/docker/i686-gnu-nopt/Dockerfile

@@ -13,6 +13,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  sudo \
  gdb
 
+RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
+ dpkg -i dumb-init_*.deb && \
+ rm dumb-init_*.deb
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
 ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
 ENV RUST_CHECK_TARGET check
 RUN mkdir /tmp/obj

src/ci/docker/i686-gnu/Dockerfile

@@ -18,6 +18,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY build-toolchain.sh /tmp/
 RUN sh /tmp/build-toolchain.sh
 
+RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
+ dpkg -i dumb-init_*.deb && \
+ rm dumb-init_*.deb
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
 ENV \
  AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \
  CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc