Skip to content

Commit 485c9eb

Browse files
authored
Update illumos cross rootfs to fix CoreCLR PAL test (#14978)
1 parent c45d411 commit 485c9eb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

eng/common/cross/build-rootfs.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -605,34 +605,34 @@ elif [[ "$__CodeName" == "illumos" ]]; then
605605
fi
606606
echo "Building binutils. Please wait.."
607607
if [[ "$__hasWget" == 1 ]]; then
608-
wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
608+
wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
609609
else
610-
curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
610+
curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf -
611611
fi
612612
mkdir build-binutils && cd build-binutils
613-
../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
613+
../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir"
614614
make -j "$JOBS" && make install && cd ..
615615
echo "Building gcc. Please wait.."
616616
if [[ "$__hasWget" == 1 ]]; then
617-
wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
617+
wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
618618
else
619-
curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
619+
curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf -
620620
fi
621621
CFLAGS="-fPIC"
622622
CXXFLAGS="-fPIC"
623623
CXXFLAGS_FOR_TARGET="-fPIC"
624624
CFLAGS_FOR_TARGET="-fPIC"
625625
export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET
626626
mkdir build-gcc && cd build-gcc
627-
../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
627+
../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
628628
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
629629
--disable-libquadmath-support --disable-shared --enable-tls
630630
make -j "$JOBS" && make install && cd ..
631631
BaseUrl=https://pkgsrc.smartos.org
632632
if [[ "$__UseMirror" == 1 ]]; then
633633
BaseUrl=https://pkgsrc.smartos.skylime.net
634634
fi
635-
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
635+
BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All"
636636
echo "Downloading manifest"
637637
if [[ "$__hasWget" == 1 ]]; then
638638
wget "$BaseUrl"

0 commit comments

Comments
 (0)