From 8c3d0f0984aacee3f006cd5bb6a9b8edf82a6b25 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 19 Jul 2025 17:23:18 +0000 Subject: [PATCH] build: fix regression in Mac builder Fix the Mac builder, broken by 3d4c03d0 (build: fix Mac M1 build on my Mini, 2025-07-19). Remove `-lintl -liconv` from `LDFLAGS` because they are not available before they are built. Signed-off-by: Rafael Kitover --- tools/macOS/builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/macOS/builder b/tools/macOS/builder index 52bb63c7..22dd5421 100755 --- a/tools/macOS/builder +++ b/tools/macOS/builder @@ -130,7 +130,7 @@ export CPPFLAGS="-isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/us export CFLAGS="-framework Carbon -framework Foundation -framework CoreServices -framework SystemConfiguration -Wno-unused-command-line-argument" export CXXFLAGS="-framework Carbon -framework Foundation -framework CoreServices -framework SystemConfiguration -Wno-unused-command-line-argument" export OBJCXXFLAGS="-framework Carbon -framework Foundation -framework CoreServices -framework SystemConfiguration -Wno-unused-command-line-argument" -export LDFLAGS="-L\"\$BUILD_ROOT/root/lib\" -lintl -liconv -L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -F/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework Carbon -framework Foundation -framework CoreServices -framework SystemConfiguration -Wno-unused-command-line-argument -Wl,-no_compact_unwind" +export LDFLAGS="-L\"\$BUILD_ROOT/root/lib\" -L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -F/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework Carbon -framework Foundation -framework CoreServices -framework SystemConfiguration -Wno-unused-command-line-argument -Wl,-no_compact_unwind" export UUID_CFLAGS="-I\"\$BUILD_ROOT/root/stow/libuuid/include\"" export UUID_LIBS="-L\"\$BUILD_ROOT/root/stow/libuuid/lib\" -luuid"