diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-25 01:41:38 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-09-25 01:41:38 -0700 |
| commit | 6a34def27e7baa7fda32acef76414e000c36d251 (patch) | |
| tree | c9174ed7986b5360c0ae8d639b2cb66f6cf731b0 | |
| parent | 1a52dd10a7714862280bf1dbecbf905a706324a7 (diff) | |
| parent | 807f3e83ba1c5299587c1c94555cd02f47dc2738 (diff) | |
Merge pull request #1856 from Diapolo/stack-protector_nonWindows
Bitcoin-Qt: expand GCC Stack-Smashing Protector usage (non Windows)
| -rw-r--r-- | bitcoin-qt.pro | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index ed2cfa8f77..c6ddc98ff4 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -30,6 +30,13 @@ contains(RELEASE, 1) { } } +!win32 { +# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection +QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1 +QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1 +# We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable! +# This can be enabled for Windows, when we switch to MinGW >= 4.4.x. +} # for extra security on Windows: enable ASLR and DEP via GCC linker flags win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat @@ -82,12 +89,6 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets } -!windows { - # for extra security against potential buffer overflows - QMAKE_CXXFLAGS += -fstack-protector - QMAKE_LFLAGS += -fstack-protector - # do not enable this on windows cross compile with mingw 4.2.x, as it will result in a non-working executable! -} # regenerate src/build.h !windows|contains(USE_BUILD_INFO, 1) { @@ -99,7 +100,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { DEFINES += HAVE_BUILD_INFO } -QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter +QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector # Input DEPENDPATH += src src/json src/qt |