Skip to content

Commit 183090f

Browse files
committed
Auto merge of #94976 - jclulow:solaris-festival, r=Mark-Simulacrum
solaris build environment should include libsendfile/liblgrp As of version 0.2.120 of the libc crate, the solaris target now requires some additional libraries to be present in the sysroot. Note that the solaris target doesn't really build against files from Solaris, but rather against some files from DilOS (a platform similar to both Solaris and illumos). Pull in the extra libraries and their compilation links from that apt repository. This aims to assist with #94052.
2 parents f2661cf + 0dcb175 commit 183090f

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

Diff for: src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh

+12-8
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,18 @@ cd solaris
3333
dpkg --add-architecture $APT_ARCH
3434
apt-get update
3535
apt-get download $(apt-cache depends --recurse --no-replaces \
36-
libc:$APT_ARCH \
37-
libm-dev:$APT_ARCH \
38-
libpthread:$APT_ARCH \
39-
libresolv:$APT_ARCH \
40-
librt:$APT_ARCH \
41-
libsocket:$APT_ARCH \
42-
system-crt:$APT_ARCH \
43-
system-header:$APT_ARCH \
36+
libc:$APT_ARCH \
37+
liblgrp-dev:$APT_ARCH \
38+
liblgrp:$APT_ARCH \
39+
libm-dev:$APT_ARCH \
40+
libpthread:$APT_ARCH \
41+
libresolv:$APT_ARCH \
42+
librt:$APT_ARCH \
43+
libsendfile-dev:$APT_ARCH \
44+
libsendfile:$APT_ARCH \
45+
libsocket:$APT_ARCH \
46+
system-crt:$APT_ARCH \
47+
system-header:$APT_ARCH \
4448
| grep "^\w")
4549

4650
for deb in *$APT_ARCH.deb; do

0 commit comments

Comments
 (0)