zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Gavin Andresen 2013-02-15 16:53:50 -05:00
parent fbd860287e
commit efb6d9aae7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bitcoin-qt.pro
View File

@ -29,19 +29,19 @@ contains(RELEASE, 1) {
!win32:!macx { !win32:!macx {
# Linux: static link # 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 { !win32 {
# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection # for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
QMAKE_CXXFLAGS *= -fstack-protector-all QMAKE_CXXFLAGS *= -fstack-protector-all
QMAKE_LFLAGS *= -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! # 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. # 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 # for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
# on Windows: enable GCC large address aware linker flag # on Windows: enable GCC large address aware linker flag

2
contrib/gitian-descriptors/gitian-win32.yml
View File

@ -24,7 +24,7 @@ script: |
cd $HOME/qt cd $HOME/qt
unzip ../build/qt-win32-4.8.3-gitian-r1.zip unzip ../build/qt-win32-4.8.3-gitian-r1.zip
cd $HOME/build/ cd $HOME/build/
export PATH=$PATH:$HOME/qt/bin/ export PATH=$HOME/qt/bin/:$PATH
# #
mkdir boost_1_50_0 mkdir boost_1_50_0
cd boost_1_50_0 cd boost_1_50_0