about summary refs log tree commit diff
path: root/src/test/incremental/thinlto
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-12-20 11:16:46 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-12-20 12:59:10 -0800
commit6737f1abcfafd5f49613bec80a216e3373ce840f (patch)
treebd72c57c87fd78bbae3f6aec365f6141e8656146 /src/test/incremental/thinlto
parentda73b4e40b2c89ca058b57de3a7e6614524ae1a7 (diff)
parent488359eba184ed8b7a58f30c9ce24e13e2af394c (diff)
downloadrust-6737f1abcfafd5f49613bec80a216e3373ce840f.tar.gz
rust-6737f1abcfafd5f49613bec80a216e3373ce840f.zip
Rollup merge of #38472 - alexcrichton:fix-cargotest, r=brson
travis: Fix the cargotest bot

Recently the Cargo revision running on cargotest was updated in #38051, and the
updated version of Cargo pulls in the openssl-sys 0.9 crate instead of the old
openssl-sys 0.7 crate. The 0.9 release of openssl-sys has slightly different
requirements and logic for detecting OpenSSL, namely it requires `pkg-config` to
be present on Linux typically.

This commit fixes this problem by installing pkg-config in the cargotest
container that's running on the bots. This in turn should hopefully fix the
build script and allow it to find the already-installed local OpenSSL libraries.
Diffstat (limited to 'src/test/incremental/thinlto')
0 files changed, 0 insertions, 0 deletions