From f74debbe7d2bf43171270d5f3f5b42f2cc2e6243 Mon Sep 17 00:00:00 2001
From: Mateusz Mikuła <matti@marinelayer.io>
Date: Thu, 2 May 2019 17:22:14 +0200
Subject: Make tests compatible with musl host

---
 src/ci/docker/dist-x86_64-musl/Dockerfile | 6 ++----
 src/ci/docker/scripts/musl-toolchain.sh   | 7 +++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/ci/docker')

diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile
index 39ad785b41a..bc3a3bd6fbc 100644
--- a/src/ci/docker/dist-x86_64-musl/Dockerfile
+++ b/src/ci/docker/dist-x86_64-musl/Dockerfile
@@ -35,10 +35,7 @@ ENV RUST_CONFIGURE_ARGS \
       --enable-extended \
       --disable-docs \
       --set target.x86_64-unknown-linux-musl.crt-static=false \
-      --build $HOSTS \
-      --set target.x86_64-unknown-linux-musl.cc=x86_64-linux-musl-gcc \
-      --set target.x86_64-unknown-linux-musl.cxx=x86_64-linux-musl-g++ \
-      --set target.x86_64-unknown-linux-musl.linker=x86_64-linux-musl-gcc
+      --build $HOSTS
 
 # Newer binutils broke things on some vms/distros (i.e., linking against
 # unknown relocs disabled by the following flag), so we need to go out of our
@@ -49,4 +46,5 @@ ENV RUST_CONFIGURE_ARGS \
 ENV CFLAGS_x86_64_unknown_linux_musl="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none \
     -Wl,--compress-debug-sections=none"
 
+# To run native tests replace `dist` below with `test`
 ENV SCRIPT python2.7 ../x.py dist --build $HOSTS
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh
index 8cdbfebea4d..e132615738b 100644
--- a/src/ci/docker/scripts/musl-toolchain.sh
+++ b/src/ci/docker/scripts/musl-toolchain.sh
@@ -45,6 +45,13 @@ cd -
 ln -s $OUTPUT/$TARGET/lib/libc.so /lib/ld-musl-$ARCH.so.1
 echo $OUTPUT/$TARGET/lib >> /etc/ld-musl-$ARCH.path
 
+# Now when musl bootstraps itself create proper toolchain symlinks to make build and tests easier
+for exec in cc gcc; do
+    ln -s $TARGET-gcc /usr/local/bin/$exec
+done
+for exec in cpp c++ g++; do
+    ln -s $TARGET-g++ /usr/local/bin/$exec
+done
 
 export CC=$TARGET-gcc
 export CXX=$TARGET-g++
-- 
cgit 1.4.1-3-g733a5