diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild
index 84c094fe6e..0ee37b1bfa 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_configure() {
 	append-lfs-flags
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild
index 186e87865f..ef20c3838a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild
@@ -11,13 +11,18 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 src_configure() {
 	tc-export AR
 
 	# Workaround ancient getopt vs C23 (bug #954755)
-	use elibc_musl && append-cppflags -D__GNU_LIBRARY__
+	if use elibc_musl || \
+		[[ ${CHOST} == *-solaris* ]] || \
+		[[ ${CHOST} == *-darwin* ]]
+	then
+		append-cppflags -D__GNU_LIBRARY__
+	fi
 
 	CONFIG_SHELL="${BROOT}"/bin/bash econf
 }