Merge #318

318: Default to `native` runner. r=therealprof a=reitermarkus Closes #314. Co-authored-by: Markus Reiter <me@reitermark.us>
cross-rs · Sep 16, 2019 · 01c7eac · 01c7eac
2 parents 69b8da7 + 74ee823
commit 01c7eac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -53,6 +53,7 @@ strategy:
     i686-apple-darwin:               { TARGET: i686-apple-darwin,               CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-10.13 }
     x86_64-apple-darwin:             { TARGET: x86_64-apple-darwin,             CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-latest, DEPLOY: 1 }
     x86_64-pc-windows-gnu:           { TARGET: x86_64-pc-windows-gnu,           CPP: 1,           STD: 1,                   RUN: 1 }
+    # `cargo build` fails with undefined symbols (https://github.com/rust-lang/rust/issues/32859) on `i686-pc-windows-gnu`.
   # i686-pc-windows-gnu:             { TARGET: i686-pc-windows-gnu,             CPP: 1,           STD: 1,                   RUN: 1 }
     x86_64-unknown-dragonfly:        { TARGET: x86_64-unknown-dragonfly,        CPP: 1, DYLIB: 1,         OPENSSL: 0.10.24,         TOOLCHAIN: nightly }
   # i686-unknown-freebsd:            { TARGET: i686-unknown-freebsd,                    DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }

diff --git a/docker/linux-runner b/docker/linux-runner
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -14,7 +14,11 @@ arch=$1
 shift
 
 if [ "$CROSS_RUNNER" = "" ]; then
-    CROSS_RUNNER=qemu-user
+    if [[ "${arch}" == i?86 ]] || [[ "${arch}" == x86_64 ]]; then
+        CROSS_RUNNER=native
+    else
+        CROSS_RUNNER=qemu-user
+    fi
 fi
 
 # select qemu arch