Skip to content

Commit 2794ac1

Browse files
committed
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
2 parents f31e901 + 220adb1 commit 2794ac1

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@ PTHREAD_CFLAGS =
13761376

13771377
# For the 'sparse' target
13781378
SPARSE_FLAGS ?= -std=gnu99
1379-
SP_EXTRA_FLAGS = -Wno-universal-initializer
1379+
SP_EXTRA_FLAGS =
13801380

13811381
# For informing GIT-BUILD-OPTIONS of the SANITIZE=leak,address targets
13821382
SANITIZE_LEAK =

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
88
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
99
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
1010
uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
11-
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
1211
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
1312

1413
ifneq ($(findstring MINGW,$(uname_S)),)

0 commit comments

Comments
 (0)