mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Merge branch 'rj/make-cleanup'
A build tweak knob has been simplified by not setting the value that is already the default; another unused one has been removed. * rj/make-cleanup: config.mak.uname: remove unused uname_P variable Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS
This commit is contained in:
2
Makefile
2
Makefile
@@ -1376,7 +1376,7 @@ PTHREAD_CFLAGS =
|
||||
|
||||
# For the 'sparse' target
|
||||
SPARSE_FLAGS ?= -std=gnu99
|
||||
SP_EXTRA_FLAGS = -Wno-universal-initializer
|
||||
SP_EXTRA_FLAGS =
|
||||
|
||||
# For informing GIT-BUILD-OPTIONS of the SANITIZE=leak,address targets
|
||||
SANITIZE_LEAK =
|
||||
|
||||
@@ -8,7 +8,6 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
||||
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
||||
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
|
||||
uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
|
||||
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
|
||||
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
|
||||
|
||||
ifneq ($(findstring MINGW,$(uname_S)),)
|
||||
|
||||
Reference in New Issue
Block a user