mirror of
https://github.com/git/git.git
synced 2026-02-28 18:48:50 +00:00
build: include procinfo.c impl for macOS
Include an implementation of trace2_collect_process_info for macOS. Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
fd104ef15d
commit
088aaf1d41
@@ -148,6 +148,8 @@ ifeq ($(uname_S),Darwin)
|
||||
HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
|
||||
CSPRNG_METHOD = arc4random
|
||||
USE_ENHANCED_BASIC_REGULAR_EXPRESSIONS = YesPlease
|
||||
HAVE_PLATFORM_PROCINFO = YesPlease
|
||||
COMPAT_OBJS += compat/darwin/procinfo.o
|
||||
|
||||
# Workaround for `gettext` being keg-only and not even being linked via
|
||||
# `brew link --force gettext`, should be obsolete as of
|
||||
|
||||
@@ -274,6 +274,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
|
||||
list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c compat/linux/procinfo.c)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
list(APPEND compat_SOURCES compat/darwin/procinfo.c)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
|
||||
@@ -1292,6 +1292,8 @@ if host_machine.system() == 'linux'
|
||||
libgit_sources += 'compat/linux/procinfo.c'
|
||||
elif host_machine.system() == 'windows'
|
||||
libgit_sources += 'compat/win32/trace2_win32_process_info.c'
|
||||
elif host_machine.system() == 'darwin'
|
||||
libgit_sources += 'compat/darwin/procinfo.c'
|
||||
else
|
||||
libgit_sources += 'compat/stub/procinfo.c'
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user