diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-30 15:26:41 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-10-01 19:45:42 +0200 |
| commit | 827d8c2e0cc08bae775c191a44d3574a7909dc3c (patch) | |
| tree | e86eac44aec2bab7737a44bf8a6a012ec93f9405 | |
| parent | d210f4f5b8f904809789a543adeba520686b7573 (diff) | |
| download | bitcoin-827d8c2e0cc08bae775c191a44d3574a7909dc3c.tar.xz | |
Revert "Remove -Wformat* warnings from makefiles"
This reverts commit 14ac0adcc7c0224a467e38bbd4ebf39d824ada8d.
| -rw-r--r-- | bitcoin-qt.pro | 2 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 2 | ||||
| -rw-r--r-- | src/makefile.mingw | 2 | ||||
| -rw-r--r-- | src/makefile.osx | 2 | ||||
| -rw-r--r-- | src/makefile.unix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 427c773e04..a73a2c379b 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -101,7 +101,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { 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 DEPENDPATH += src src/json src/qt diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 3709bb94d6..0970469a98 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -32,7 +32,7 @@ LIBS= \ DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE 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 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) diff --git a/src/makefile.mingw b/src/makefile.mingw index 1a32f02bbf..54054c25f9 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -27,7 +27,7 @@ LIBS= \ DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE 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 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) diff --git a/src/makefile.osx b/src/makefile.osx index a0de217c01..359739bd5e 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -66,7 +66,7 @@ CFLAGS = -g endif # 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) OBJS= \ diff --git a/src/makefile.unix b/src/makefile.unix index b73ce2833b..a41b57b4fc 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -93,7 +93,7 @@ DEBUGFLAGS=-g # 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. -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) # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only |