diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-09-12 16:09:30 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-09-12 16:09:30 -0500 |
| commit | 77a2ebc2c418c7cfe40222e119e92a5fc0d1e7f3 (patch) | |
| tree | 09de34dda58f26814416a864f4c961222cb053b5 | |
| parent | 0c3f39ee0df22396f0fae09046da4e5379bd1c43 (diff) | |
| parent | b31c04e1483631f30b1be128c2fc108d411f7e06 (diff) | |
| download | monzero-gui-77a2ebc2c418c7cfe40222e119e92a5fc0d1e7f3.tar.gz monzero-gui-77a2ebc2c418c7cfe40222e119e92a5fc0d1e7f3.tar.xz monzero-gui-77a2ebc2c418c7cfe40222e119e92a5fc0d1e7f3.zip | |
Merge pull request #1554
b31c04e pro: disable -fstack-protector* on windows (stoffu)
| -rw-r--r-- | monero-wallet-gui.pro | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 16c6784d..a11bb11b 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -13,8 +13,10 @@ CONFIG += c++11 link_pkgconfig packagesExist(libpcsclite) { PKGCONFIG += libpcsclite } -QMAKE_CXXFLAGS += -fPIC -fstack-protector -QMAKE_LFLAGS += -fstack-protector +!win32 { + QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong + QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong +} # cleaning "auto-generated" bitmonero directory on "make distclean" 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_CFLAGS += -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 ios { message("Host is IOS") |