From 1b6d64ffc3f56da9265e442e38dca572de441136 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sat, 27 Apr 2024 13:47:35 -0500
Subject: [PATCH] The "extra" libraries want to go in a magic order when static
 linking, and probing them in parallel makes that awkward, so if there are any
 pass --start-group and --end-group to the linker so it actually resolves
 crosstalk between them.

---
 scripts/make.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/make.sh b/scripts/make.sh
index 512fdc75..de849f83 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -69,6 +69,8 @@ LIBRARIES=$(
       echo -l$i &
   done | sort | xargs
 )
+# Actually resolve dangling dependencies in extra libraries when static linking
+[ -n "$LIBRARIES" ] && LIBRARIES="-Wl,--start-group $LIBRARIES -Wl,--end-group"
 
 [ -z "$VERSION" ] && [ -d ".git" ] && [ -n "$(which git 2>/dev/null)" ] &&
   VERSION="$(git describe --tags --abbrev=12 2>/dev/null)"
-- 
2.39.2