From 270b467ccfcc14e665acc8706bed0daef99134af Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Feb 15 2024 04:01:51 +0000
Subject: link mode: only apply -Wl,--whole-archive to convenience libraries.


---

diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c
index 440be9e..6132b86 100644
--- a/src/logic/linkcmd/slbt_linkcmd_argv.c
+++ b/src/logic/linkcmd/slbt_linkcmd_argv.c
@@ -378,15 +378,26 @@ int slbt_exec_link_adjust_argument_vector(
 			*aarg++ = *carg++;
 
 		} else if (!(strcmp(dot,".a"))) {
-			if (flibrary && !fwholearchive)
-				*aarg++ = "-Wl,--whole-archive";
+			if (flibrary && !fwholearchive) {
+				strcpy(lib,*carg);
+				dot = strrchr(lib,'.');
+				strcpy(dot,".lai");
+
+				if ((fd = openat(fdcwd,lib,O_RDONLY,0)) < 0)
+					*aarg++ = "-Wl,--whole-archive";
+			}
 
 			dpath = lib;
 			sprintf(lib,"%s.slibtool.deps",*carg);
 			*aarg++ = *carg++;
 
-			if (flibrary && !fwholearchive)
-				*aarg++ = "-Wl,--no-whole-archive";
+			if (flibrary && !fwholearchive) {
+				if (fd < 0) {
+					*aarg++ = "-Wl,--no-whole-archive";
+				} else {
+					close(fd);
+				}
+			}
 
 		} else if (strcmp(dot,dctx->cctx->settings.dsosuffix)) {
 			*aarg++ = *carg++;