From: Andy Polyakov <appro@openssl.org>
Date: Thu, 14 Jun 2018 20:07:48 +0000 (+0200)
Subject: Configure: allow some file extensions to be overridden by target config.
X-Git-Tag: OpenSSL_1_1_1-pre9~256
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b48d4397b8ee4256f0b0a115eb99f27ae89995e0;p=oweals%2Fopenssl.git

Configure: allow some file extensions to be overridden by target config.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6487)
---

diff --git a/Configure b/Configure
index 9a600913c7..2e1902aeff 100755
--- a/Configure
+++ b/Configure
@@ -1111,8 +1111,9 @@ $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
 $target{exe_extension}=".pm"  if ($config{target} =~ /vos/);
 
 ($target{shared_extension_simple}=$target{shared_extension})
-    =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||;
-$target{dso_extension}=$target{shared_extension_simple};
+    =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
+    unless defined($target{shared_extension_simple});
+$target{dso_extension}//=$target{shared_extension_simple};
 ($target{shared_import_extension}=$target{shared_extension_simple}.".a")
     if ($config{target} =~ /^(?:Cygwin|mingw)/);