aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-10-19 15:02:48 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-10-19 15:02:57 +0200
commitda7d57fb9501ad8939a2923f2a60fa540eae8cfa (patch)
tree76237081f9b40daf57100b526081b48baa89d925
parent5f5ee0f3ce6bfe8c0b1d15b5a498077f7a59ee03 (diff)
parentbfcdc21a5da25ec1aa4aecc4cd8960dfa1c11781 (diff)
downloadbitcoin-da7d57fb9501ad8939a2923f2a60fa540eae8cfa.tar.xz
Merge pull request #6852
bfcdc21 build: make sure OpenSSL heeds noexecstack (Wladimir J. van der Laan)
-rw-r--r--depends/packages/openssl.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk
index 22b1017ffc..687aae6682 100644
--- a/depends/packages/openssl.mk
+++ b/depends/packages/openssl.mk
@@ -10,7 +10,7 @@ $(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/o
$(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2
$(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3
$(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
-$(package)_config_opts_linux=-fPIC
+$(package)_config_opts_linux=-fPIC -Wa,--noexecstack
$(package)_config_opts_x86_64_linux=linux-x86_64
$(package)_config_opts_i686_linux=linux-generic32
$(package)_config_opts_arm_linux=linux-generic32