[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b903fb604a9759a54f02e3675fcec2a0e571e3c0 (commit)
      from  a93ccf91588163528d475bf9714f24e6e765172a (commit)


- Log -----------------------------------------------------------------
commit b903fb604a9759a54f02e3675fcec2a0e571e3c0
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Dec 17 12:56:24 2017 +0100

    Restore the use of LDCMD when linking applications
    
    It is a hack, but it existed in the recently removed Makefile.shared,
    and its use is documented in fuzz/README.md, so we cannot drop it now.
    
    Fixes https://github.com/google/oss-fuzz/issues/1037
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4947)

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index a514833..43b1f03 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1053,7 +1053,7 @@ EOF
       return <<"EOF";
 $bin$exeext: $objs $deps
 	rm -f $bin$exeext
-	$cmd $cmdflags \$(LDFLAGS) \$(BIN_LDFLAGS) -o $bin$exeext $objs \\
+	\$\${LDCMD:-$cmd} $cmdflags \$(LDFLAGS) \$(BIN_LDFLAGS) -o $bin$exeext $objs \\
 		\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)
 EOF
   }