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 11a9560017..eb6b82b61c 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
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="https://carlowood.github.io/which/"
@@ -16,5 +16,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390
 src_configure() {
 	tc-export AR
 
+	# Workaround ancient getopt vs C23 (bug #954755)
+	use elibc_musl && append-cppflags -D__GNU_LIBRARY__
+
 	CONFIG_SHELL="${BROOT}"/bin/bash econf
 }