diff options
| author | bors <bors@rust-lang.org> | 2023-04-26 04:53:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-26 04:53:49 +0000 |
| commit | 70540d51275086ce1a4cb12e9d96a97134df792e (patch) | |
| tree | b53744650608bb0cc6c73b0d86e03a9bce7493a7 | |
| parent | adaac6b166df57ea5a20d56e4cce503b55aca927 (diff) | |
| parent | 603e5d764e8549ef490aa002e861b16af24961fd (diff) | |
Auto merge of #110784 - cuviper:build-gcc-https, r=jyn514
Revert "Download the GCC sources insecurely" This reverts commit 3da037f82988b8b3aca2ce13c5c81ba975923cab. This workaround was added after TLS problems with Debian 6 were noted in <https://github.com/rust-lang/rust/pull/86586#issuecomment-868355356>, but we should be well past that since #95026, where our oldest images are now based on CentOS 7.
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh index 41ca1385c75..6da3f89220e 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh @@ -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 |