averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/macos-iconv-workaround' into jch

Browse Source 
Workaround that "iconv" shipped as part of macOS, which is broken
handling ISO-2022 encoded strings.

* rs/macos-iconv-workaround:
  config.mak.uname: use iconv from Homebrew on macOS
This commit is contained in:
Junio C Hamano
2025-12-12 22:11:26 +09:00
parent 61e86607c3 1c63a651e1
commit d1bc2ecd33
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config.mak.uname
View File

@@ -182,6 +182,13 @@ ifeq ($(uname_S),Darwin)
endif
endif
ifeq ($(shell test -d /opt/homebrew/opt/libiconv/ && echo y),y)
ICONVDIR ?= /opt/homebrew/opt/libiconv
endif
ifeq ($(shell test -d /usr/local/opt/libiconv/ && echo y),y)
ICONVDIR ?= /usr/local/opt/libiconv
endif
BASIC_LDFLAGS += -framework CoreServices
endif
ifeq ($(uname_S),SunOS)