Auto merge of #60240 - mati865:musl_toolchain, r=<try>

 Bootstrap x86_64 musl by itself

It should slightly reduce build time and prepares ground for musl native tests.

NOTE: I haven't tested artifacts yet (only the build).

Can I have double try?

r? @alexcrichton

Author: bors

.travis.yml

@@ -22,7 +22,7 @@ matrix:
     # Images used in testing PR and try-build should be run first.
     - env: IMAGE=x86_64-gnu-llvm-6.0 RUST_BACKTRACE=1
       name: x86_64-gnu-llvm-6.0
-      if: type = pull_request OR branch = auto
+      if: branch = auto
 
     - env: IMAGE=dist-x86_64-linux DEPLOY=1
       name: dist-x86_64-linux
@@ -33,7 +33,7 @@ matrix:
     # additional testing.
     - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
       name: dist-x86_64-linux-alt
-      if: branch = try OR branch = auto
+      if: branch = auto
 
     - env: >
         RUST_CHECK_TARGET=dist
@@ -188,7 +188,7 @@ matrix:
       if: branch = auto
     - env: IMAGE=dist-x86_64-musl DEPLOY=1
       name: dist-x86_64-musl
-      if: branch = auto
+      if: branch = try OR branch = auto
     - env: IMAGE=dist-x86_64-netbsd DEPLOY=1
       name: dist-x86_64-netbsd
       if: branch = auto
@@ -227,7 +227,7 @@ matrix:
       if: branch = auto
     - env: IMAGE=mingw-check
       name: mingw-check
-      if: type = pull_request OR branch = auto
+      if: branch = auto
 
     - stage: publish toolstate
       if: branch = master AND type = push

src/ci/docker/dist-x86_64-musl/Dockerfile

@@ -28,10 +28,17 @@ RUN CFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
+ENV HOSTS=x86_64-unknown-linux-musl
+
 ENV RUST_CONFIGURE_ARGS \
       --musl-root-x86_64=/usr/local/x86_64-linux-musl \
       --enable-extended \
-      --disable-docs
+      --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
 
 # 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
@@ -42,12 +49,4 @@ 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"
 
-ENV HOSTS=x86_64-unknown-linux-musl \
-    CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \
-    CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
-
-# Musl defaults to static libs but we need them to be dynamic for host toolchain.
-# The toolchain will produce static libs by default.
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-
-ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
+ENV SCRIPT python2.7 ../x.py dist --build $HOSTS