diff options
| author | bors <bors@rust-lang.org> | 2017-03-18 03:31:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-18 03:31:58 +0000 |
| commit | df3ab375f36f78dc25c36c08ac10ca7c8ec93fca (patch) | |
| tree | 39d114358b9a82d1d850a515a81ddfb9a7acebb2 /src | |
| parent | 703b246287fa9e7ef39bd66f978f6dc6fa119c15 (diff) | |
| parent | 5fab9bf4f67235f7f5599f0e29bc7b2dd746d084 (diff) | |
| download | rust-df3ab375f36f78dc25c36c08ac10ca7c8ec93fca.tar.gz rust-df3ab375f36f78dc25c36c08ac10ca7c8ec93fca.zip | |
Auto merge of #40507 - alexcrichton:static-libcurl, r=brson
travis: Ensure cargo links libcurl statically We don't want a dynamic dependency in the library that we ship, so link it statically by configuring curl-sys's build script to not pick up the system version via pkg-config.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/dist-x86-linux/Dockerfile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ci/docker/dist-x86-linux/Dockerfile b/src/ci/docker/dist-x86-linux/Dockerfile index 50244280971..852ce1806ec 100644 --- a/src/ci/docker/dist-x86-linux/Dockerfile +++ b/src/ci/docker/dist-x86-linux/Dockerfile @@ -86,4 +86,10 @@ ENV RUST_CONFIGURE_ARGS \ --enable-extended \ --enable-sanitizers ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS + +# This is the only builder which will create source tarballs ENV DIST_SRC 1 + +# When we build cargo in this container, we don't want it to use the system +# libcurl, instead it should compile its own. +ENV LIBCURL_NO_PKG_CONFIG 1 |