mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-03 09:56:38 -05:00
Merge pull request #2167 from Diapolo/Qt_laa_flag
enable GCC large address aware linker flag (Windows only)
This commit is contained in:
commit
5a4af8f71f
3 changed files with 6 additions and 2 deletions
|
@ -44,6 +44,8 @@ QMAKE_LFLAGS *= -fstack-protector-all
|
||||||
QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now
|
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
|
||||||
|
win32:QMAKE_LFLAGS *= -Wl,--large-address-aware
|
||||||
|
|
||||||
# use: qmake "USE_QRCODE=1"
|
# use: qmake "USE_QRCODE=1"
|
||||||
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
|
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
|
||||||
|
|
|
@ -33,7 +33,8 @@ LIBS= \
|
||||||
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-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
|
# enable: ASLR, DEP and large address aware
|
||||||
|
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware
|
||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,8 @@ LIBS= \
|
||||||
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
|
||||||
DEBUGFLAGS=-g
|
DEBUGFLAGS=-g
|
||||||
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-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
|
# enable: ASLR, DEP and large address aware
|
||||||
|
LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware
|
||||||
|
|
||||||
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue