dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-06-24 08:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hn/macos-linker-warning'

Browse Source 
Xcode 15 and later has a linker set to complain when the same library
archive is listed twice on the command line.  Squelch the annoyance.

* hn/macos-linker-warning:
  config.mak.uname: avoid macOS dup-library warning
This commit is contained in:
Junio C Hamano
2026-06-22 20:05:04 -07:00
parent b0dcf92387 f6791de689
commit 1ea786d14a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config.mak.uname
View File

@@ -173,8 +173,15 @@ ifeq ($(uname_S),Darwin)
NEEDS_GOOD_LIBICONV = UnfortunatelyYes
endif
# Silence Xcode 16.3+ linker warning about __DATA,__common alignment.
LD_MAJOR_VERSION = $(shell ld -v 2>&1 | sed -n 's/.*PROJECT:ld-\([0-9]*\).*/\1/p')
# ld reports "PROJECT:{ld,ld64,dyld}-NNN", match any of the three.
LD_MAJOR_VERSION = $(shell ld -v 2>&1 | sed -n 's/.*PROJECT:[^ ]*-\([0-9][0-9]*\).*/\1/p')
# Silence the Xcode 15+ warning about archives listed more than once.
ifeq ($(shell test -n "$(LD_MAJOR_VERSION)" && test "$(LD_MAJOR_VERSION)" -ge 907 && echo 1),1)
BASIC_LDFLAGS += -Wl,-no_warn_duplicate_libraries
endif
# Silence the Xcode 16.3+ warning about __DATA,__common alignment.
ifeq ($(shell test -n "$(LD_MAJOR_VERSION)" && test "$(LD_MAJOR_VERSION)" -ge 1167 && echo 1),1)
BASIC_CFLAGS += -fno-common
endif