aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-03-19 09:55:50 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2013-03-19 09:55:50 -0700
commitdb725e64b2826ee30dea456454e79f12ea9a10a7 (patch)
tree533d193df56d8a8949687d14904b389941a29d1c
parente5644e88e8dd7dc88d510edacf5556eef8cb41eb (diff)
parent86b9c4aa67f44447a3bba309d947974d0fcd09ae (diff)
downloadbitcoin-db725e64b2826ee30dea456454e79f12ea9a10a7.tar.xz
Merge pull request #2376 from Diapolo/pro-file
re-enable -D_FORTIFY_SOURCE=2 for all platforms
-rw-r--r--bitcoin-qt.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 5042adfbdf..bf41314052 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -30,10 +30,8 @@ contains(RELEASE, 1) {
macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
!win32:!macx {
- # Linux: static link
+ # Linux: static link and extra security (see: https://wiki.debian.org/Hardening)
LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now
- # for extra security (see: https://wiki.debian.org/Hardening)
- QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
}
}
@@ -44,6 +42,8 @@ contains(RELEASE, 1) {
# Exclude on 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 (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
+QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
# on Windows: enable GCC large address aware linker flag