From cf08d2d3b1a663c390a544b0b16e0555ff784430 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Sat, 1 Nov 2025 14:30:12 +0000
Subject: [PATCH] build: reduce explicit dependencies on macOS CoreFoundation

* src/local.mk: Revert v9.7-322-gc2e1816a5, instead relying
on the more focused v9.8-79-g532cd66af.  When built with
--disable-nls on macOS this will result in only some commands
being linked with INTL_MACOSX_LIBS, thus resulting in env(1)
at least not setting a __CF_USER_TEXT_ENCODING envirnoment variable.
---
 NEWS         | 4 ++++
 src/local.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 53e5b387c2..2802c0c7b1 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,10 @@ GNU coreutils NEWS                                    -*- outline -*-
   regressed due to the avoidance of copy offload, seen with OpenZFS at least.
   [bug introduced in coreutils-9.8]
 
+  `env` on macOS, for now only when built with --disable-nls,
+  will no longer always set a __CF_USER_TEXT_ENCODING environment variable.
+  [bug introduced in coreutils-9.8]
+
   'numfmt' no longer reads out-of-bounds memory with trailing blanks in input.
   [bug introduced with numfmt in coreutils-8.21]
 
diff --git a/src/local.mk b/src/local.mk
index 14f4d0c13f..a8ad6b43f8 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -100,7 +100,7 @@ remove_ldadd =
 # replacement functions defined in libcoreutils.a.
 # Similarly for $(MBRTOWC_LIB).
 LDADD = src/libver.a lib/libcoreutils.a $(LIBINTL) $(MBRTOWC_LIB) \
-  $(INTL_MACOSX_LIBS) lib/libcoreutils.a
+  lib/libcoreutils.a
 
 # First, list all programs, to make listing per-program libraries easier.
 # See [ below.
-- 
2.47.3