Skip to content

Commit e9b10f9

Browse files
committed
Auto merge of #40525 - alexcrichton:beta-next, r=brson
[beta] travis: Ensure cargo links libcurl statically This is a beta backport of #40507
2 parents 408d49e + 00722bb commit e9b10f9

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/ci/docker/dist-x86-linux/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,10 @@ ENV RUST_CONFIGURE_ARGS \
8686
--enable-extended \
8787
--enable-sanitizers
8888
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
89+
90+
# This is the only builder which will create source tarballs
8991
ENV DIST_SRC 1
92+
93+
# When we build cargo in this container, we don't want it to use the system
94+
# libcurl, instead it should compile its own.
95+
ENV LIBCURL_NO_PKG_CONFIG 1

0 commit comments

Comments
 (0)