summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-04-14 14:19:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-15 12:03:55 +0900
commit92a1377a2ac69b2975f268c1dda079333f8d9df1 (patch)
tree0f82d6aabc5116f3304394a14b4124e6977f4ee6 /config.mak.uname
parentmingw: allow building with an MSYS2 runtime v3.x (diff)
downloadtgif-92a1377a2ac69b2975f268c1dda079333f8d9df1.tar.xz
macOS: make sure that gettext is found
Due to reasons (some XCode versions seem to include gettext, some don't?), Homebrew does not expose the libraries and headers in /usr/local/ by default anymore. Let's help find them again. Note: for some reason, this is a change of behavior caused by the upgrade to Mojave, identified in our Azure Pipeline; it seems that Homebrew used to add the /usr/local/ directories to the include and link search path before, but now it no longer does. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 2011bac6d5..78f9d0ba5e 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