Merge branch 'rs/pull-leakfix'

[thirdparty/git.git] / config.mak.uname

diff --git a/config.mak.uname b/config.mak.uname
index 9aa9a937a9e5ad0897bddf9feb38a662c4ed9d77..c7eba69e54e669c61dd8b7333d97fb587964b68c 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -133,8 +133,17 @@ ifeq ($(uname_S),Darwin)
        HAVE_BSD_SYSCTL = YesPlease
        FREAD_READS_DIRECTORIES = UnfortunatelyYes
        HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
-       BASIC_CFLAGS += -I/usr/local/include
-       BASIC_LDFLAGS += -L/usr/local/lib
+
+       # Workaround for `gettext` being keg-only and not even being linked via
+       # `brew link --force gettext`, should be obsolete as of
+       # https://github.com/Homebrew/homebrew-core/pull/53489
+       ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
+               BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
+               BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
+               ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
+                       MSGFMT = /usr/local/opt/gettext/bin/msgfmt
+               endif
+       endif
 endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease
@@ -307,6 +316,7 @@ ifeq ($(uname_S),GNU)
        NO_STRLCPY = YesPlease
        HAVE_PATHS_H = YesPlease
        LIBC_CONTAINS_LIBINTL = YesPlease
+       FREAD_READS_DIRECTORIES = UnfortunatelyYes
 endif
 ifeq ($(uname_S),IRIX)
        NO_SETENV = YesPlease
@@ -720,9 +730,9 @@ vcxproj:
         echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
        git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
 
-       # Add command-list.h
-       $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h
-       git add -f command-list.h
+       # Add command-list.h and config-list.h
+       $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h
+       git add -f config-list.h command-list.h
 
        # Add scripts
        rm -f perl/perl.mak