Skip to content

Commit 74b310a

Browse files
committed
Fix pkgconfig for openssl build
1 parent 270aaa5 commit 74b310a

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

ci/build-run-docker.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,12 @@ docker run \
2222
-e SKIP_TESTS=$SKIP_TESTS \
2323
-it $DOCKER \
2424
ci/run-docker.sh
25+
26+
# check that rustup-init was built with ssl support
27+
# see https://github.com/rust-lang-nursery/rustup.rs/issues/1051
28+
out=$(nm target/$TARGET/release/rustup-init | grep Curl_ssl_init)
29+
30+
if [ -z "$out" ]; then
31+
echo "Missing ssl support!!!!"
32+
exit 1
33+
fi

ci/run-docker.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ else
177177
install=$final_install_path
178178
fi
179179

180+
# the install dir was renamed, so we need to update pkgconfig
181+
sed -i -e 's/-partial//g' $install/lib/pkgconfig/*
182+
180183
# Variables to the openssl-sys crate to link statically against the OpenSSL we
181184
# just compiled above
182185
export OPENSSL_STATIC=1

0 commit comments

Comments
 (0)