Skip to content

Commit

Permalink
Auto merge of rust-lang#110784 - cuviper:build-gcc-https, r=jyn514
Browse files Browse the repository at this point in the history
Revert "Download the GCC sources insecurely"

This reverts commit 3da037f.

This workaround was added after TLS problems with Debian 6 were noted in <rust-lang#86586 (comment)>, but we should be well past that since rust-lang#95026, where our oldest images are now based on CentOS 7.
  • Loading branch information
bors committed Apr 26, 2023
2 parents adaac6b + 603e5d7 commit 70540d5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ cd gcc-$GCC
# latter host is presented to `wget`! Therefore, we choose to download from the insecure HTTP server
# instead here.
#
# FIXME: use HTTPS (see https://github.com/rust-lang/rust/pull/86586#issuecomment-868355356)
sed -i'' 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
sed -i'' 's|ftp://gcc\.gnu\.org/|https://gcc.gnu.org/|g' ./contrib/download_prerequisites

./contrib/download_prerequisites
mkdir ../gcc-build
Expand Down

0 comments on commit 70540d5

Please sign in to comment.