diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-31 13:34:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-31 13:34:17 -0700 |
| commit | 2794ac123d2d0498878d8e47ff4a2e1675557317 (patch) | |
| tree | 8a25dffa4f45b91404a7bb25de5218adb549bc17 | |
| parent | Merge branch 'jt/doc-post-receive-hook-update' (diff) | |
| parent | config.mak.uname: remove unused uname_P variable (diff) | |
| download | git-2794ac123d2d0498878d8e47ff4a2e1675557317.tar.gz git-2794ac123d2d0498878d8e47ff4a2e1675557317.zip | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config.mak.uname | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -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 = diff --git a/config.mak.uname b/config.mak.uname index 85d63821ec..aa0fd26bd5 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -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)),) |