Skip to content

Commit 5fb5ebc

Browse files
committed
wip: cleanup static libs
1 parent 7a8e75c commit 5fb5ebc

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

.docker/install-static-libs.sh

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,20 @@ PARALLEL_HASHMAP_TARBALL="parallel-hashmap-${PARALLEL_HASHMAP_VERSION}.tar.gz"
9292
use_lib() {
9393
local lib="$1"
9494
case "$CARCH" in
95-
ppc64le|s390x|arm)
95+
ppc64le|arm)
9696
case "$lib" in
9797
libunwind|libdwarf|cpptrace)
9898
return 1
9999
;;
100100
esac
101101
;;
102+
s390x)
103+
case "$lib" in
104+
libunwind|libdwarf|cpptrace|libressl)
105+
return 1
106+
;;
107+
esac
108+
;;
102109
esac
103110
if [[ ",$PKGS," == *",$lib,"* ]]; then
104111
return 0
@@ -277,12 +284,11 @@ EOF
277284

278285
# COMPILERS="clang clang-lto clang-minsize-lto gcc"
279286
case "$CARCH" in
280-
ppc64le|s390x)
287+
# There are currently issues with Clang & PPC64LE, see
288+
# https://github.com/rui314/mold/issues/1490
289+
ppc64le)
281290
COMPILERS="gcc"
282291
;;
283-
arm)
284-
COMPILERS="clang clang-minsize-lto"
285-
;;
286292
*)
287293
if [[ "$ARCH" == "riscv64" ]]; then
288294
# This is so slow natively, stick to the basics for now
@@ -310,10 +316,7 @@ EOF
310316
export COMP_LDFLAGS="$TARGET_FLAGS $COMMON_LDFLAGS -L$INSTALL_DIR/lib"
311317

312318
case "$CARCH" in
313-
arm)
314-
export COMP_LDFLAGS="-fuse-ld=lld $COMP_LDFLAGS"
315-
;;
316-
ppc64le|s390x)
319+
ppc64le)
317320
;;
318321
*)
319322
export COMP_LDFLAGS="-fuse-ld=mold $COMP_LDFLAGS"
@@ -621,19 +624,17 @@ EOF
621624
fi
622625

623626
if use_lib libressl; then
624-
if [[ "$CARCH" =~ ^(x86_64|aarch64|riscv64|i386)$ ]]; then
625-
opt_size
626-
cd "$WORKDIR"
627-
tar xf ${WORKROOT}/${LIBRESSL_TARBALL}
628-
cd libressl-${LIBRESSL_VERSION}
629-
mkdir build
630-
cd build
631-
cmake .. -DCMAKE_PREFIX_PATH="$INSTALL_DIR" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR_LIBRESSL" \
632-
-DBUILD_SHARED_LIBS=OFF -DLIBRESSL_APPS=OFF -DLIBRESSL_TESTS=OFF \
633-
${CMAKE_ARGS}
634-
ninja
635-
ninja install
636-
fi
627+
opt_size
628+
cd "$WORKDIR"
629+
tar xf ${WORKROOT}/${LIBRESSL_TARBALL}
630+
cd libressl-${LIBRESSL_VERSION}
631+
mkdir build
632+
cd build
633+
cmake .. -DCMAKE_PREFIX_PATH="$INSTALL_DIR" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR_LIBRESSL" \
634+
-DBUILD_SHARED_LIBS=OFF -DLIBRESSL_APPS=OFF -DLIBRESSL_TESTS=OFF \
635+
${CMAKE_ARGS}
636+
ninja
637+
ninja install
637638
fi
638639

639640
if use_lib libevent; then

0 commit comments

Comments
 (0)