summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-06-15 15:24:14 +0200
committerAndy Polyakov <appro@openssl.org>2018-06-22 10:57:31 +0200
commit8f29569ef384d0f6f107bb8b1262e36d874a3cc7 (patch)
treefb3287e90d2809fc96aa730379be153a90a4eab4 /Configurations
parentcff89b179c91c7c1f6f08b2c1f1697005c1804d2 (diff)
Configurations/10-main.conf: always pass -bsrv4 to AIX linker.
This makes AIX build procedure behave more like e.g. Solaris. Most notably this makes it possible to pass -Wl,-R,'$(LIBRPATH)' at config time to embed installation destination as library search path into openssl binary. This doesn't imply that other applications have to be linked with -bsvr4, they are free to choose whatever appropriate for given circumstances. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6487)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/10-main.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 0086ceec0e..62b4c9d147 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1110,12 +1110,12 @@ my %targets = (
template => 1,
sys_id => "AIX",
lib_cppflags => "-DB_ENDIAN",
+ lflags => "-Wl,-bsvr4",
thread_scheme => "pthreads",
dso_scheme => "dlfcn",
shared_target => "self",
- bin_lflags => shared("-Wl,-bsvr4"),
- module_ldflags => "-Wl,-G,-bsymbolic,-bexpall,-bnolibpath",
- shared_ldflag => "-Wl,-G,-bsymbolic,-bnolibpath",
+ module_ldflags => "-Wl,-G,-bsymbolic,-bexpall",
+ shared_ldflag => "-Wl,-G,-bsymbolic",
shared_defflag => "-Wl,-bE:",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
dso_extension => ".so",