.travis.yml

@@ -9,6 +9,7 @@ matrix:
     - env: TARGET=aarch64-unknown-linux-gnu
     - env: TARGET=armv7-unknown-linux-gnueabihf
     - env: TARGET=i686-unknown-linux-gnu
+    - env: TARGET=i686-unknown-linux-musl
     - env: TARGET=mips-unknown-linux-gnu
     - env: TARGET=mips64-unknown-linux-gnuabi64
     - env: TARGET=mips64el-unknown-linux-gnuabi64
@@ -17,6 +18,10 @@ matrix:
     - env: TARGET=powerpc64-unknown-linux-gnu
     - env: TARGET=powerpc64le-unknown-linux-gnu
     - env: TARGET=s390x-unknown-linux-gnu
+    - env: TARGET=thumbv6m-none-eabi
+    - env: TARGET=thumbv7em-none-eabi
+    - env: TARGET=thumbv7em-none-eabihf
+    - env: TARGET=thumbv7m-none-eabi
     - env: TARGET=x86_64-unknown-linux-musl
     - env: TARGET=i686-apple-darwin
       os: osx

CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.1.2] - 2016-12-31
+
+### Added
+
+- Support for `i686-unknown-linux-musl`
+- Support for `cross build`ing crates for the `thumbv*-none-eabi*` targets.
+
 ## [v0.1.1] - 2016-12-28
 
 ### Added
@@ -17,5 +24,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release. Supports 12 targets.
 
-[Unreleased]: https://github.com/japaric/cross/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/japaric/cross/compare/v0.1.2...HEAD
+[v0.1.2]: https://github.com/japaric/cross/compare/v0.1.1...v0.1.2
 [v0.1.1]: https://github.com/japaric/cross/compare/v0.1.0...v0.1.1

Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["cross", "compilation", "testing", "tool"]
 license = "MIT OR Apache-2.0"
 name = "cross"
 repository = "https://github.com/japaric/cross"
-version = "0.1.1"
+version = "0.1.2"
 
 [dependencies]
 error-chain = "0.7.1"

README.md

@@ -43,7 +43,7 @@
 ## Installation
 
 ```
-$ cargo install --git https://github.com/japaric/cross
+$ cargo install cross
 ```
 
 ## Usage
@@ -89,25 +89,26 @@ because QEMU gets upset when you spawn several threads. This also means that, if
 one of your unit tests spawns several threads then it's more likely to fail or,
 worst, "hang" (never terminate).
 
-| Target                               | glibc | GCC   | QEMU  | OpenSSL | `test` |
-|--------------------------------------|-------|-------|-------|---------|:------:|
-| `aarch64-unknown-linux-gnu`          | 2.19  | 4.8.2 | 2.8.0 | 1.0.2j  |   ✓    |
-| `armv7-unknown-linux-gnueabihf`      | 2.15  | 4.6.2 | 2.8.0 | 1.0.2j  |   ✓    |
-| `i686-unknown-linux-gnu`             | 2.15  | 4.6.2 | N/A   | 1.0.2j  |   ✓    |
-| `mips-unknown-linux-gnu` (\*)        | 2.23  | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
-| `mips64-unknown-linux-gnuabi64` (\*) | 2.23  | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
-| `mips64el-unknown-linux-gnuabi64`    | 2.23  | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
-| `mipsel-unknown-linux-gnu`           | 2.23  | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
-| `powerpc-unknown-linux-gnu`          | 2.19  | 4.8.2 | 2.7.1 | 1.0.2j  |   ✓    |
-| `powerpc64-unknown-linux-gnu` (\*)   | 2.19  | 4.8.2 | 2.7.1 | 1.0.2j  |   ✓    |
-| `powerpc64le-unknown-linux-gnu`      | 2.19  | 4.8.2 | 2.7.1 | 1.0.2j  |   ✓    |
-| `s390x-unknown-linux-gnu`            | 2.23  | 5.3.1 | 2.8.0 | 1.0.2j  |        |
-| `x86_64-unknown-linux-gnu`           | 2.15  | 4.6.2 | N/A   | 1.0.2j  |   ✓    |
-| `x86_64-unknown-linux-musl`          | N/A   | 5.3.1 | N/A   | 1.0.2j  |   ✓    |
-
-(\*) For some reason behind my comprehension, the build script of the `curl-sys`
-crate hangs when `cross build`ing that crate for these three targets
-(see [issue #4](https://github.com/japaric/cross/issues/4)).
+| Target                               |  libc  | GCC   | QEMU  | OpenSSL | `test` |
+|--------------------------------------|--------|-------|-------|---------|:------:|
+| `aarch64-unknown-linux-gnu`          | 2.19   | 4.8.2 | 2.8.0 | 1.0.2j  |   ✓    |
+| `armv7-unknown-linux-gnueabihf`      | 2.15   | 4.6.2 | 2.8.0 | 1.0.2j  |   ✓    |
+| `i686-unknown-linux-gnu`             | 2.15   | 4.6.2 | N/A   | 1.0.2j  |   ✓    |
+| `i686-unknown-linux-musl`            | 1.1.15 | 5.3.1 | N/A   | N/A     |   ✓    |
+| `mips-unknown-linux-gnu`             | 2.23   | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
+| `mips64-unknown-linux-gnuabi64`      | 2.23   | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
+| `mips64el-unknown-linux-gnuabi64`    | 2.23   | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
+| `mipsel-unknown-linux-gnu`           | 2.23   | 5.3.1 | 2.8.0 | 1.0.2j  |   ✓    |
+| `powerpc-unknown-linux-gnu`          | 2.19   | 4.8.2 | 2.7.1 | 1.0.2j  |   ✓    |
+| `powerpc64-unknown-linux-gnu`        | 2.19   | 4.8.2 | 2.7.1 | 1.0.2j  |   ✓    |
+| `powerpc64le-unknown-linux-gnu`      | 2.19   | 4.8.2 | 2.7.1 | 1.0.2j  |   ✓    |
+| `s390x-unknown-linux-gnu`            | 2.23   | 5.3.1 | 2.8.0 | 1.0.2j  |        |
+| `thumbv6m-none-eabi`                 | N/A    | 5.3.1 | N/A   | N/A     |        |
+| `thumbv7em-none-eabi`                | N/A    | 5.3.1 | N/A   | N/A     |        |
+| `thumbv7em-none-eabihf`              | N/A    | 5.3.1 | N/A   | N/A     |        |
+| `thumbv7m-none-eabi`                 | N/A    | 5.3.1 | N/A   | N/A     |        |
+| `x86_64-unknown-linux-gnu`           | 2.15   | 4.6.2 | N/A   | 1.0.2j  |   ✓    |
+| `x86_64-unknown-linux-musl`          | 1.1.15 | 5.3.1 | N/A   | 1.0.2j  |   ✓    |
 
 ## Caveats / gotchas
 

ci/script.sh

@@ -13,7 +13,27 @@ main() {
 
     cargo install --path .
 
-    if [ $TARGET != i686-apple-darwin ]; then
+    case $TARGET in
+        thumbv*-none-eabi*)
+            td=$(mktemp -d)
+
+            git clone \
+                --depth 1 \
+                --recursive \
+                https://github.com/rust-lang-nursery/compiler-builtins $td
+
+            pushd $td
+            cargo generate-lockfile
+            cross build --features c --target $TARGET
+            popd
+
+            rm -rf $td
+
+            return
+        ;;
+    esac
+
+    if [ $TARGET != i686-apple-darwin && $TARGET != i686-unknown-linux-musl ]; then
         td=$(mktemp -d)
 
         git clone --depth 1 https://github.com/rust-lang/cargo $td
@@ -29,7 +49,8 @@ main() {
     # NOTE(x86_64-musl) can't test compiler-builtins because that crate needs
     # cdylibs and this musl target doesn't support cdylibs
     case $TARGET in
-        s390x-unknown-linux-gnu | \
+        i686-unknown-linux-musl | \
+            s390x-unknown-linux-gnu | \
             x86_64-unknown-linux-musl)
         ;;
         *)

docker/i686-unknown-linux-musl/Dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    gcc-multilib
+
+COPY musl.sh /
+RUN bash /musl.sh 1.1.15 i386 -m32
+
+RUN apt-get install -y --no-install-recommends \
+    ca-certificates \
+    cmake \
+    make \
+    pkg-config
+
+ENV CC_i686_unknown_linux_musl=musl-gcc

docker/musl-gcc.specs.x86_64-unknown-linux-musl

@@ -0,0 +1,32 @@
+%rename cpp_options old_cpp_options
+
+*cpp_options:
+-nostdinc -isystem /usr/local/include -isystem include%s %(old_cpp_options)
+
+*cc1:
+%(cc1_cpu) -nostdinc -isystem /usr/local/include -isystem include%s
+
+*link_libgcc:
+-L/usr/local/lib -L .%s
+
+*libgcc:
+libgcc.a%s %:if-exists(libgcc_eh.a%s)
+
+*startfile:
+%{!shared: /usr/local/lib/%{pie:S}crt1.o} /usr/local/lib/crti.o %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}
+
+*endfile:
+%{shared|pie:crtendS.o%s;:crtend.o%s} /usr/local/lib/crtn.o
+
+*link:
+-dynamic-linker /lib/ld-musl-x86_64.so.1 -nostdlib %{shared:-shared} %{static:-static} %{rdynamic:-export-dynamic}
+
+*esp_link:
+
+
+*esp_options:
+
+
+*esp_cpp_options:
+
+

docker/musl-gcc.x86_64-unknown-linux-musl

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "${REALGCC:-cc}" "$@" -specs "/usr/local/lib/musl-gcc.specs"

docker/musl.sh

@@ -0,0 +1,47 @@
+set -ex
+
+main() {
+    local version=$1 \
+          target=$2
+
+    local dependencies=(
+        ca-certificates
+        curl
+        make
+    )
+
+    apt-get install -y --no-install-recommends ${dependencies[@]}
+
+    local td=$(mktemp -d)
+
+    pushd $td
+    curl https://www.musl-libc.org/releases/musl-$version.tar.gz | \
+        tar --strip-components=1 -xz
+
+    if [ ! -z $target ]; then
+        ln -s /usr/bin/{,$target-}ar
+        ln -s /usr/bin/{,$target-}cc
+        ln -s /usr/bin/{,$target-}ranlib
+    fi
+
+    CFLAGS="-fPIC ${@:3}" ./configure \
+          --disabled-shared \
+          --prefix=/usr/local \
+          $(test -z $target || echo --target=$target)
+    nice make -j$(nproc)
+    nice make install
+    ln -s /usr/bin/ar /usr/local/bin/musl-ar
+
+    if [ ! -z $target ]; then
+        rm /usr/bin/$target-{ar,ranlib}
+    fi
+
+    apt-get purge --auto-remove -y ${dependencies[@]}
+
+    popd
+
+    rm -rf $td
+    rm $0
+}
+
+main "${@}"

docker/openssl.sh

@@ -1,8 +1,7 @@
 set -ex
 
 main() {
-    local cflags=$4 \
-          os=$2 \
+    local os=$2 \
           triple=$3 \
           version=$1
 
@@ -22,8 +21,13 @@ main() {
     pushd $td
     curl https://www.openssl.org/source/openssl-$version.tar.gz | \
         tar --strip-components=1 -xz
-    AR=${triple}ar CC=${triple}gcc ./Configure --prefix=/openssl no-dso $os -fPIC $cflags
-    nice make -j$(nproc)
+    AR=${triple}ar CC=${triple}gcc ./Configure \
+      --prefix=/openssl \
+      no-dso \
+      $os \
+      -fPIC \
+      ${@:4}
+    nice make -j1
     make install
 
     apt-get purge --auto-remove -y ${dependencies[@]}

docker/thumbv6m-none-eabi/Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gcc \
+    gcc-arm-none-eabi \
+    libc6-dev \
+    libnewlib-dev && \
+    curl -LSfs http://japaric.github.io/trust/install.sh | \
+    sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin

docker/thumbv7em-none-eabi/Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gcc \
+    gcc-arm-none-eabi \
+    libc6-dev \
+    libnewlib-dev && \
+    curl -LSfs http://japaric.github.io/trust/install.sh | \
+    sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin

docker/thumbv7em-none-eabihf/Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gcc \
+    gcc-arm-none-eabi \
+    libc6-dev \
+    libnewlib-dev && \
+    curl -LSfs http://japaric.github.io/trust/install.sh | \
+    sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin

docker/thumbv7m-none-eabi/Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gcc \
+    gcc-arm-none-eabi \
+    libc6-dev \
+    libnewlib-dev && \
+    curl -LSfs http://japaric.github.io/trust/install.sh | \
+    sh -s -- --git japaric/xargo --tag v0.3.1 --target x86_64-unknown-linux-gnu --to /usr/bin

docker/x86_64-unknown-linux-musl/Dockerfile

@@ -2,11 +2,15 @@ FROM ubuntu:16.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    musl-tools && \
-    ln -s /usr/bin/ar /usr/bin/musl-ar
+    gcc
+
+COPY musl.sh /
+RUN bash /musl.sh 1.1.15
+COPY musl-gcc.x86_64-unknown-linux-musl /usr/local/bin/musl-gcc
+COPY musl-gcc.specs.x86_64-unknown-linux-musl /usr/local/lib/musl-gcc.specs
 
 COPY openssl.sh /
-RUN bash /openssl.sh 1.0.2j linux-x86_64 musl-
+RUN bash /openssl.sh 1.0.2j linux-x86_64 musl- -static
 
 RUN apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -15,4 +19,5 @@ RUN apt-get install -y --no-install-recommends \
     make \
     pkg-config
 
-ENV OPENSSL_DIR=/openssl
+ENV CC_i686_unknown_linux_musl=musl-gcc \
+    OPENSSL_DIR=/openssl

src/cargo.rs

@@ -65,5 +65,5 @@ pub fn root() -> Result<Option<PathBuf>> {
 
 /// Pass-through mode
 pub fn run(args: &[String], verbose: bool) -> Result<ExitStatus> {
-    Command::new("cargo").args(args).run_and_get_exit_status(verbose)
+    Command::new("cargo").args(args).run_and_get_status(verbose)
 }