don't depend on binfmt_misc when using a recent toolchain

cross-rs · Sep 21, 2017 · f0a50dc · f0a50dc
1 parent ee02b3d
commit f0a50dc
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,6 @@ version = "0.1.12-dev"
 error-chain = "0.7.1"
 lazy_static = "0.2"
 libc = "0.2.18"
-rustc_version = "0.1.7"
+rustc_version = "0.2.1"
 semver = "0.6.0"
 toml = "0.2.1"
diff --git a/docker/aarch64-unknown-linux-gnu/Dockerfile b/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh aarch64
 
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
+    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64 \
     CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
     CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/arm-unknown-linux-gnueabi/Dockerfile b/docker/arm-unknown-linux-gnueabi/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh arm
 
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
+    CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \
     CC_arm_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
     CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/arm-unknown-linux-musleabi/Dockerfile b/docker/arm-unknown-linux-musleabi/Dockerfile
@@ -19,5 +19,6 @@ RUN apt-get install -y --no-install-recommends \
     gcc-arm-linux-gnueabi
 
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_LINKER=arm-linux-gnueabi-gcc \
+    CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_RUNNER=qemu-arm \
     CC_arm_unknown_linux_musleabi=arm-linux-gnueabi-gcc \
     RUST_TEST_THREADS=1
diff --git a/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh arm
 
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
+    CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
     CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
     CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/armv7-unknown-linux-musleabihf/Dockerfile b/docker/armv7-unknown-linux-musleabihf/Dockerfile
@@ -19,5 +19,6 @@ RUN apt-get install -y --no-install-recommends \
     gcc-arm-linux-gnueabihf
 
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-gnueabihf-gcc \
+    CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_RUNNER=qemu-arm \
     CC_armv7_unknown_linux_musleabihf=arm-linux-gnueabihf-gcc \
     RUST_TEST_THREADS=1
diff --git a/docker/mips-unknown-linux-gnu/Dockerfile b/docker/mips-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh mips
 
 ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
+    CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER=qemu-mips \
     CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
     CXX_mips_unknown_linux_gnu=mips-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/docker/mips64-unknown-linux-gnuabi64/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh mips64
 
 ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
+    CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER=qemu-mips64 \
     CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
     CXX_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh mips64el
 
 ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
+    CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER=qemu-mips64el \
     CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
     CXX_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/mipsel-unknown-linux-gnu/Dockerfile b/docker/mipsel-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh mipsel
 
 ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc \
+    CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_RUNNER=qemu-mipsel \
     CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc \
     CXX_mipsel_unknown_linux_gnu=mipsel-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/powerpc-unknown-linux-gnu/Dockerfile b/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh ppc
 
 ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
+    CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER=qemu-ppc \
     CC_powerpc_unknown_linux_gnu=powerpc-linux-gnu-gcc \
     CXX_powerpc_unknown_linux_gnu=powerpc-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/powerpc64-unknown-linux-gnu/Dockerfile b/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh ppc64
 
 ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
+    CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER=qemu-ppc64 \
     CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc \
     CXX_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh ppc64le
 
 ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
+    CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER=qemu-ppc64le \
     CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
     CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/s390x-unknown-linux-gnu/Dockerfile b/docker/s390x-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh s390x
 
 ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
+    CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER=qemu-s390x \
     CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
     CXX_s390x_unknown_linux_gnu=s390x-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/docker/sparc64-unknown-linux-gnu/Dockerfile b/docker/sparc64-unknown-linux-gnu/Dockerfile
@@ -20,6 +20,7 @@ RUN apt-get install -y --no-install-recommends \
     bash /qemu.sh sparc64
 
 ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
+    CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=qemu-sparc64 \
     CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
     CXX_sparc64_unknown_linux_gnu=sparc64-linux-gnu-g++ \
     OPENSSL_DIR=/openssl \

diff --git a/src/main.rs b/src/main.rs
@@ -26,7 +26,7 @@ use toml::{Parser, Value};
 
 use cargo::Root;
 use errors::*;
-use rustc::TargetList;
+use rustc::{TargetList, VersionMetaExt};
 
 #[allow(non_camel_case_types)]
 #[derive(Clone, Copy, PartialEq)]
@@ -393,8 +393,9 @@ fn run() -> Result<ExitStatus> {
     let verbose =
         args.all.iter().any(|a| a == "--verbose" || a == "-v" || a == "-vv");
 
+    let version_meta = rustc_version::version_meta().chain_err(|| "couldn't fetch the `rustc` version")?;
     if let Some(root) = cargo::root()? {
-        let host = rustc::host();
+        let host = version_meta.host();
 
         if host.is_supported(args.target.as_ref()) {
             let target = args.target
@@ -418,10 +419,11 @@ fn run() -> Result<ExitStatus> {
 
             if target.needs_docker() &&
                args.subcommand.map(|sc| sc.needs_docker()).unwrap_or(false) {
-                if args.subcommand.map(|sc| sc.needs_interpreter()).unwrap_or(false) &&
-                   target.needs_interpreter() &&
-                   !interpreter::is_registered(&target)? {
-                    docker::register(&target, verbose)?
+                if version_meta.needs_interpreter() &&
+                    args.subcommand.map(|sc| sc.needs_interpreter()).unwrap_or(false) &&
+                    target.needs_interpreter() &&
+                    !interpreter::is_registered(&target)? {
+                        docker::register(&target, verbose)?
                 }
 
                 return docker::run(&target,

diff --git a/src/rustc.rs b/src/rustc.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::process::Command;
 
-use rustc_version;
+use rustc_version::{Version, VersionMeta};
 
 use Host;
 use errors::*;
@@ -17,21 +17,41 @@ impl TargetList {
     }
 }
 
-pub fn host() -> Host {
-    Host::from(&*rustc_version::version_meta().host)
+pub trait VersionMetaExt {
+    fn host(&self) -> Host;
+    fn needs_interpreter(&self) -> bool;
+}
+
+impl VersionMetaExt for VersionMeta {
+    fn host(&self) -> Host {
+        Host::from(&*self.host)
+    }
+
+    fn needs_interpreter(&self) -> bool {
+        self.semver >= Version {
+            major: 1,
+            minor: 18,
+            patch: 0,
+            pre: vec![],
+            build: vec![],
+        }
+    }
 }
 
 pub fn target_list(verbose: bool) -> Result<TargetList> {
     Command::new("rustc")
         .args(&["--print", "target-list"])
         .run_and_get_stdout(verbose)
         .map(|s| {
-            TargetList { triples: s.lines().map(|l| l.to_owned()).collect() }
+            TargetList {
+                triples: s.lines().map(|l| l.to_owned()).collect(),
+            }
         })
 }
 
 pub fn sysroot(verbose: bool) -> Result<PathBuf> {
-    let mut stdout = Command::new("rustc").args(&["--print", "sysroot"])
+    let mut stdout = Command::new("rustc")
+        .args(&["--print", "sysroot"])
         .run_and_get_stdout(verbose)?;
 
     if stdout.ends_with('\n') {