mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-10 20:03:34 -03:00
Revert "Remove -Wformat* warnings from makefiles"
This reverts commit 14ac0adcc7
.
This commit is contained in:
parent
d210f4f5b8
commit
827d8c2e0c
5 changed files with 5 additions and 5 deletions
|
@ -101,7 +101,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
|
||||||
DEFINES += HAVE_BUILD_INFO
|
DEFINES += HAVE_BUILD_INFO
|
||||||
}
|
}
|
||||||
|
|
||||||
QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-format -Wno-format-security -Wno-unused-parameter -Wstack-protector
|
QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
DEPENDPATH += src src/json src/qt
|
DEPENDPATH += src src/json src/qt
|
||||||
|
|
|
@ -32,7 +32,7 @@ LIBS= \
|
||||||
|
|
||||||
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CFLAGS=-O2 -w -Wall -Wextra -Wno-format -Wno-format-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat
|
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat
|
||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
|
@ -27,7 +27,7 @@ LIBS= \
|
||||||
|
|
||||||
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wno-format -Wno-format-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat
|
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat
|
||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
|
@ -66,7 +66,7 @@ CFLAGS = -g
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ppc doesn't work because we don't support big-endian
|
# ppc doesn't work because we don't support big-endian
|
||||||
CFLAGS += -Wall -Wextra -Wno-format -Wno-format-security -Wno-unused-parameter \
|
CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
|
||||||
$(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
$(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||||
|
|
||||||
OBJS= \
|
OBJS= \
|
||||||
|
|
|
@ -93,7 +93,7 @@ DEBUGFLAGS=-g
|
||||||
|
|
||||||
# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
|
# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
|
||||||
# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
|
# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
|
||||||
xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wno-format -Wno-format-security -Wno-unused-parameter \
|
xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
|
||||||
$(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
|
$(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
|
||||||
|
|
||||||
# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
|
# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
|
||||||
|
|
Loading…
Reference in a new issue