Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/macos-gettext-build'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 25 Apr 2019 07:41:25 +0000
(16:41 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 25 Apr 2019 07:41:25 +0000
(16:41 +0900)
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
config.mak.uname
patch
|
blob
|
history
raw
(from parent 1:
061ed42
)
diff --git
a/config.mak.uname
b/config.mak.uname
index 41e85fab1c8d1ed5b6b7ffdbe8b840bdc12d77de..3605fead53a79d4e37c92a026701b89fcce501c5 100644
(file)
--- 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