nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-21 13:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #45343 - bgermann:master, r=alexcrichton

Browse Source 
Make Solaris builder compatible with Solaris 10 retry

Unfortunately, #45255 does not quite cut it,
so use a different approach to have Solaris 10 compatibility
by tricking libbacktrace's autoconf tests.
The sysroot download routine is slightly changed, too.
This commit is contained in:
kennytm 2017-10-19 23:13:27 +08:00
commit 7da795ba10
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ci/docker/cross2/build-solaris-toolchain.sh
View File

@ -38,37 +38,38 @@ cd solaris
dpkg --add-architecture $APT_ARCH dpkg --add-architecture $APT_ARCH
apt-get update apt-get update
apt-get download \ apt-get download $(apt-cache depends --recurse --no-replaces \
libc:$APT_ARCH \
libc-dev:$APT_ARCH \ libc-dev:$APT_ARCH \
libm:$APT_ARCH \
libm-dev:$APT_ARCH \ libm-dev:$APT_ARCH \
libpthread:$APT_ARCH \
libpthread-dev:$APT_ARCH \ libpthread-dev:$APT_ARCH \
libresolv:$APT_ARCH \
libresolv-dev:$APT_ARCH \ libresolv-dev:$APT_ARCH \
librt:$APT_ARCH \
librt-dev:$APT_ARCH \ librt-dev:$APT_ARCH \
libsocket:$APT_ARCH \
libsocket-dev:$APT_ARCH \ libsocket-dev:$APT_ARCH \
system-crt:$APT_ARCH \ system-crt:$APT_ARCH \
system-header:$APT_ARCH system-header:$APT_ARCH \
| grep "^\w")
for deb in *$APT_ARCH.deb; do for deb in *$APT_ARCH.deb; do
dpkg -x $deb . dpkg -x $deb .
done done
# Strip Solaris 11 functions that are optionally used by libbacktrace. # Remove Solaris 11 functions that are optionally used by libbacktrace.
# This is for Solaris 10 compatibility. # This is for Solaris 10 compatibility.
$ARCH-sun-solaris2.10-strip -N dl_iterate_phdr -N strnlen lib/$LIB_ARCH/libc.so rm usr/include/link.h
patch -p0 << 'EOF'
--- usr/include/string.h
+++ usr/include/string10.h
@@ -93 +92,0 @@
-extern size_t strnlen(const char *, size_t);
EOF
mkdir /usr/local/$ARCH-sun-solaris2.10/usr mkdir /usr/local/$ARCH-sun-solaris2.10/usr
mv usr/include /usr/local/$ARCH-sun-solaris2.10/usr/include mv usr/include /usr/local/$ARCH-sun-solaris2.10/usr/include
mv usr/lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib mv usr/lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
mv lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib mv lib/$LIB_ARCH/* /usr/local/$ARCH-sun-solaris2.10/lib
ln -s /usr/local/$ARCH-sun-solaris2.10/usr/include /usr/local/$ARCH-sun-solaris2.10/sys-include ln -s usr/include /usr/local/$ARCH-sun-solaris2.10/sys-include
ln -s /usr/local/$ARCH-sun-solaris2.10/usr/include /usr/local/$ARCH-sun-solaris2.10/include ln -s usr/include /usr/local/$ARCH-sun-solaris2.10/include
cd .. cd ..
rm -rf solaris rm -rf solaris
@ -97,8 +98,7 @@ hide_output ../gcc-$GCC/configure \
--disable-libada \ --disable-libada \
--disable-libsanitizer \ --disable-libsanitizer \
--disable-libquadmath-support \ --disable-libquadmath-support \
--disable-lto \ --disable-lto
--with-sysroot=/usr/local/$ARCH-sun-solaris2.10
hide_output make -j10 hide_output make -j10
hide_output make install hide_output make install