about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJonathan Sieber <mail@strfry.org>2018-10-18 21:47:26 +0200
committerMateusz MikuĊ‚a <mati865@gmail.com>2019-03-13 22:21:06 +0100
commit3729e48bf2c6bc45b3efdee56ec2ce2cbcffe900 (patch)
treef8e8aa0e75eec0f02f5a7e5202c9c8a5906acdd2 /src
parent880b041f3cfc03443d4b4723f0b0cba565ee6177 (diff)
downloadrust-3729e48bf2c6bc45b3efdee56ec2ce2cbcffe900.tar.gz
rust-3729e48bf2c6bc45b3efdee56ec2ce2cbcffe900.zip
Set RUSTFLAGS env to make dylib work
The musl-target doesn't automatically disable static linking of musl when building a dylib, and then complains it can't build a dylib.
As a workaround, disable static linking via RUSTFLAGS, to see how far the build gets.
The proper fix is to have rustc figure that out automagically.
Diffstat (limited to 'src')
-rw-r--r--src/ci/docker/dist-x86_64-musl/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile
index e6ffac40199..441c2e7c57a 100644
--- a/src/ci/docker/dist-x86_64-musl/Dockerfile
+++ b/src/ci/docker/dist-x86_64-musl/Dockerfile
@@ -43,6 +43,8 @@ ENV CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no
 
 ENV HOSTS=x86_64-unknown-linux-musl
 
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+
 ENV SCRIPT \
       python2.7 ../x.py test --host $HOSTS --target $HOSTS && \
       python2.7 ../x.py dist --host $HOSTS --target $HOSTS