diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-15 16:53:50 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-15 19:55:44 -0500 |
| commit | efb6d9aae7595ee2c76aa898b94aed53f079390f (patch) | |
| tree | 3c7600952f484dbfe599757fdd9b8b1adabaf3c3 | |
| parent | fbd860287e6474bd7a61013796541bf2ea72d5cd (diff) | |
Minor build fixes
Two changes: make some linux-specific linker options linux and linker specific.
And in the cross-compile environment, prefer the $HOME/qt/bin tools to
whatever might be somewhere else in the path.
| -rw-r--r-- | bitcoin-qt.pro | 16 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 169d227794..1c6bc0a654 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -29,19 +29,19 @@ contains(RELEASE, 1) { !win32:!macx { # Linux: static link - LIBS += -Wl,-Bstatic + LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now + # for extra security (see: https://wiki.debian.org/Hardening) + QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 } } !win32 { -# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection -QMAKE_CXXFLAGS *= -fstack-protector-all -QMAKE_LFLAGS *= -fstack-protector-all -# 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 against potential buffer overflows: enable GCCs Stack Smashing Protection + QMAKE_CXXFLAGS *= -fstack-protector-all + QMAKE_LFLAGS *= -fstack-protector-all + # 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) -QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now # 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 diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 4860a15997..fd3b55325a 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -24,7 +24,7 @@ script: | cd $HOME/qt unzip ../build/qt-win32-4.8.3-gitian-r1.zip cd $HOME/build/ - export PATH=$PATH:$HOME/qt/bin/ + export PATH=$HOME/qt/bin/:$PATH # mkdir boost_1_50_0 cd boost_1_50_0 |