Skip to content

Commit 9863015

Browse files
authored
Merge branch 'develop' into efs-util-upgrade
2 parents 2c5f5dc + adc19fd commit 9863015

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cookbooks/aws-parallelcluster-platform/resources/arm_pl/partial/_arm_pl_common.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,10 @@
125125
rm -rf gcc-#{gcc_version}
126126
tar -xf #{gcc_tarball}
127127
cd gcc-#{gcc_version}
128-
# Patch the download_prerequisites script to download over https and not ftp. This works better in China regions.
129-
sed -i "s#ftp://gcc\.gnu\.org/pub/gcc/infrastructure##{node['cluster']['artifacts_s3_url']}/dependencies/gcc/prerequisites#g" ./contrib/download_prerequisites
128+
# Patch the download_prerequisites script to download GCC dependencies from our public bucket.
129+
# This is required to support build image in isolated environments.
130+
# Note: gcc 9.3 uses ftp, whereas gcc 11.3 uses http.
131+
sed -i "s#\\(ftp\\|http\\)://gcc\.gnu\.org/pub/gcc/infrastructure##{node['cluster']['artifacts_s3_url']}/dependencies/gcc/prerequisites#g" ./contrib/download_prerequisites
130132
./contrib/download_prerequisites
131133
mkdir build && cd build
132134
../configure --prefix=/opt/arm/armpl/gcc/#{gcc_version} --disable-bootstrap --enable-checking=release --enable-languages=c,c++,fortran --disable-multilib

0 commit comments

Comments
 (0)