diff options
| author | Andy Russell <arussell123@gmail.com> | 2019-02-11 23:50:31 -0500 |
|---|---|---|
| committer | Andy Russell <arussell123@gmail.com> | 2019-02-12 09:39:38 -0500 |
| commit | 8b21a55b965aab6e5110fdb1d27c43d9212bd85f (patch) | |
| tree | 7a4602baf2fd934b7c1240dac7637f669bbb2a26 /src/ci/docker | |
| parent | 0710c2026f257b9560f7f84539bc57183c3a02d3 (diff) | |
| download | rust-8b21a55b965aab6e5110fdb1d27c43d9212bd85f.tar.gz rust-8b21a55b965aab6e5110fdb1d27c43d9212bd85f.zip | |
use Ubuntu keyserver for CloudABI ports
The Ubuntu keyserver is more reliable than the MIT PGP server, which is prone to going down. This commit also explicitly uses port 80 on the keyserver for reasons outlined in #57844.
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh index 391f9b2fff8..3354a796c35 100755 --- a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh +++ b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh @@ -32,9 +32,8 @@ ln -s ../lib/llvm-5.0/bin/lld /usr/bin/${target}-ld ln -s ../../${target} /usr/lib/llvm-5.0/${target} # Install the C++ runtime libraries from CloudABI Ports. -echo deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi > \ - /etc/apt/sources.list.d/cloudabi.list -curl 'https://pgp.mit.edu/pks/lookup?op=get&search=0x0DA51B8531344B15' | \ - apt-key add - +apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15 +add-apt-repository -y 'deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi' + apt-get update -apt-get install -y $(echo ${target} | sed -e s/_/-/g)-cxx-runtime +apt-get install -y "${target//_/-}-cxx-runtime" |