diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 22:39:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 22:39:57 +0200 |
| commit | aabf3ea14439bccc87bdfd3d23315a19f928fab4 (patch) | |
| tree | f574cf978058d70e76b238e02d62b2f39441febb /config.mak.uname | |
| parent | Merge branch 'dd/sparse-fixes' (diff) | |
| parent | macOS/brew: let the build find gettext headers/libraries/msgfmt (diff) | |
| download | git-aabf3ea14439bccc87bdfd3d23315a19f928fab4.tar.xz git-aabf3ea14439bccc87bdfd3d23315a19f928fab4.zip | |
Merge branch 'ds/build-homebrew-gettext-fix'
Recent update to Homebrew used by macOS folks breaks build by
moving gettext library and necessary headers.
* ds/build-homebrew-gettext-fix:
macOS/brew: let the build find gettext headers/libraries/msgfmt
Diffstat (limited to 'config.mak.uname')
| -rw-r--r-- | config.mak.uname | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/config.mak.uname b/config.mak.uname index 3e526f6b9f..87c7f8d76c 100644 --- 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 |