diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-03-13 22:13:37 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-13 22:13:37 -0700 |
| commit | 5fab9bf4f67235f7f5599f0e29bc7b2dd746d084 (patch) | |
| tree | d2eae6bb74c30b32477d8693403e42b59cdee6d4 /src | |
| parent | fd182c4010b5aee72d070b15e90c98cb0fdc3776 (diff) | |
| download | rust-5fab9bf4f67235f7f5599f0e29bc7b2dd746d084.tar.gz rust-5fab9bf4f67235f7f5599f0e29bc7b2dd746d084.zip | |
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 3f6f71c41b5..282739ceebe 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 |