diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:25 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:25 +0900 |
commit | aa8c8d914e4ae709e4fd025f359594f62653d9e5 (patch) | |
tree | 7923aa5b79e2d8c9acd3a310726fde8032151eab /config.mak.uname | |
parent | 061ed420ec2dc97e2a922a6f02992869089cefb3 (diff) | |
parent | 92a1377a2ac69b2975f268c1dda079333f8d9df1 (diff) | |
download | git-aa8c8d914e4ae709e4fd025f359594f62653d9e5.tar.gz |
Merge branch 'js/macos-gettext-build'
Build with gettext breaks on recent macOS w/ Homebrew when
/usr/local/bin is not on PATH, which has been corrected.
* js/macos-gettext-build:
macOS: make sure that gettext is found
Diffstat (limited to 'config.mak.uname')
-rw-r--r-- | config.mak.uname | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 41e85fab1c..3605fead53 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -114,6 +114,8 @@ 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 endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease |