summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-11-16 14:05:14 +0000
committerMatt Caswell <matt@openssl.org>2019-01-04 20:23:16 +0000
commit6b97cc6ec17586ff9c1d96ab5c3e0b6d829074a8 (patch)
treee591f6a1443069c45c5ecf22e9b0794025e0f974 /Configurations
parentf5f3dfd5efcc1e4073719f788ed4c40f8dc8cf3b (diff)
Introduce a no-pinshared option
This option prevents OpenSSL from pinning itself in memory. Fixes #7598 [extended tests] Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7983)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index ac8828e7e3..37e20011cd 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -651,7 +651,7 @@ my %targets = (
dso_scheme => "dlfcn",
shared_target => "linux-shared",
shared_cflag => "-fPIC",
- shared_ldflag => "-Wl,-znodelete",
+ shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
enable => [ "afalgeng" ],
},