Merge pull request #1554

b31c04e pro: disable -fstack-protector* on windows (stoffu)
This commit is contained in:
luigi1111 2018-09-12 16:09:30 -05:00
commit 77a2ebc2c4
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -13,8 +13,10 @@ CONFIG += c++11 link_pkgconfig
packagesExist(libpcsclite) { packagesExist(libpcsclite) {
PKGCONFIG += libpcsclite PKGCONFIG += libpcsclite
} }
QMAKE_CXXFLAGS += -fPIC -fstack-protector !win32 {
QMAKE_LFLAGS += -fstack-protector QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong
QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong
}
# cleaning "auto-generated" bitmonero directory on "make distclean" # cleaning "auto-generated" bitmonero directory on "make distclean"
QMAKE_DISTCLEAN += -r $$WALLET_ROOT QMAKE_DISTCLEAN += -r $$WALLET_ROOT
@ -130,8 +132,8 @@ android {
QMAKE_CXXFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security -fstack-protector -fstack-protector-strong QMAKE_CXXFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security
QMAKE_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security -fstack-protector -fstack-protector-strong QMAKE_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security
ios { ios {
message("Host is IOS") message("Host is IOS")