Skip to content

Commit

Permalink
Fix pkgconfig for openssl build
Browse files Browse the repository at this point in the history
  • Loading branch information
malbarbo committed Apr 12, 2017
1 parent 270aaa5 commit 74b310a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions ci/build-run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,12 @@ docker run \
-e SKIP_TESTS=$SKIP_TESTS \
-it $DOCKER \
ci/run-docker.sh

# check that rustup-init was built with ssl support
# see https://github.com/rust-lang-nursery/rustup.rs/issues/1051
out=$(nm target/$TARGET/release/rustup-init | grep Curl_ssl_init)

if [ -z "$out" ]; then
echo "Missing ssl support!!!!"
exit 1
fi
3 changes: 3 additions & 0 deletions ci/run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ else
install=$final_install_path
fi

# the install dir was renamed, so we need to update pkgconfig
sed -i -e 's/-partial//g' $install/lib/pkgconfig/*

# Variables to the openssl-sys crate to link statically against the OpenSSL we
# just compiled above
export OPENSSL_STATIC=1
Expand Down

0 comments on commit 74b310a

Please sign in to comment.