[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  74b7f339aa58af57c0e71b7efca66e6f2db5ae2e (commit)
      from  40184c96103a388209939c1c19920971c05bb78c (commit)


- Log -----------------------------------------------------------------
commit 74b7f339aa58af57c0e71b7efca66e6f2db5ae2e
Author: jenda1 <lana.jan at gmail.com>
Date:   Tue Jul 20 16:32:49 2021 +0200

    Makefile: Avoid changing LIBDIR based on whether it already exists
    
    unix-Makefile.tmpl checks if the target LIBDIR exists on the build
    machine or not and based on the result modify the final LIBDIR.
    This should be avoided, build results should not depend on the build
    machine root filesystem layout. It makes the build results unstable.
    
    The fix simply removes the dir existence test from the unix-Makefile.tmpl.
    
    Fixes: openssl#16121
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16122)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 0fb80f1968..f88a70f482 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -297,14 +297,7 @@ OPENSSLDIR={- #
               $openssldir -}
 LIBDIR={- our $libdir = $config{libdir};
           unless ($libdir) {
-              #
-              # if $prefix/lib$target{multilib} is not an existing
-              # directory, then assume that it's not searched by linker
-              # automatically, in which case adding $target{multilib} suffix
-              # causes more grief than we're ready to tolerate, so don't...
-              our $multilib =
-                  -d "$prefix/lib$target{multilib}" ? $target{multilib} : "";
-              $libdir = "lib$multilib";
+              $libdir = "lib$target{multilib}";
           }
           file_name_is_absolute($libdir) ? "" : $libdir -}
 # $(libdir) is chosen to be compatible with the GNU coding standards