diff options
| author | Xiaofei Bai <xiaofei.bai@arm.com> | 2021-08-18 07:57:26 +0000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-08-27 09:21:14 +0200 |
| commit | 597d24e2ab395991cb2048529714ea534c173591 (patch) | |
| tree | 758e735593fb275fb46ca6418fc23e17933d9694 /Configurations | |
| parent | c023d98dcf2ba1cc30f545ae54d0e037e80a8794 (diff) | |
| download | openssl-new-597d24e2ab395991cb2048529714ea534c173591.tar.gz | |
Fix libdir path on darwin
In current Configure script, libdir can be specified either an absolute
path or relative, while in Configurations/shared-info.pl, on darwin
system "-install_name" only accepts relative libdir path, and the
program fails when receiving absolute libdir path. This PR is to fix
this and match requirements of scripts.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16393)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/shared-info.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl index 2b236b4b9b..abf2d98dcc 100644 --- a/Configurations/shared-info.pl +++ b/Configurations/shared-info.pl @@ -43,7 +43,7 @@ my %shared_info; 'darwin-shared' => { module_ldflags => '-bundle', shared_ldflag => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)', - shared_sonameflag => '-install_name $(INSTALLTOP)/$(LIBDIR)/', + shared_sonameflag => '-install_name $(libdir)/', }, 'cygwin-shared' => { shared_ldflag => '-shared -Wl,--enable-auto-image-base', |