mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-11 08:30:32 -05:00
Merge branch 'hn/macos-linker-warning' into next
A linker warning on macOS when building with Xcode 16.3 or newer has been avoided by passing -fno-common to the compiler when a sufficiently new linker is detected. * hn/macos-linker-warning: config.mak.uname: avoid macOS linker warning on Xcode 16.3+
This commit is contained in:
@@ -173,6 +173,12 @@ 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')
|
||||
ifeq ($(shell test -n "$(LD_MAJOR_VERSION)" && test "$(LD_MAJOR_VERSION)" -ge 1167 && echo 1),1)
|
||||
BASIC_CFLAGS += -fno-common
|
||||
endif
|
||||
|
||||
# The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require
|
||||
# Unix domain sockets and PThreads.
|
||||
ifndef NO_PTHREADS
|
||||
|
||||
Reference in New Issue
Block a user