[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  3ed1839dc3ad285ca83609007a18911d3c7bfdbe (commit)
      from  adc4f1fc25b2cac90076f1e1695b05b7aeeae501 (commit)


- Log -----------------------------------------------------------------
commit 3ed1839dc3ad285ca83609007a18911d3c7bfdbe
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Mar 6 14:36:11 2016 +0100

    Makefile.in: populate [PLIB_]LDFLAG even with $target{} settings.
    
    RT#4373
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 892a208..e7b3f99 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,8 +95,8 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -}
 CC= $(CROSS_COMPILE){- $target{cc} -}
 CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -}
 CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}
-LDFLAG= {- $config{lflags} -}
-PLIB_LDFLAG= {- $config{plib_lflags} -}
+LDFLAG= {- $target{lflags} -} {- $config{lflags} -}
+PLIB_LDFLAG= {- $target{plib_lflags} -} {- $config{plib_lflags} -}
 EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -}
 EXE_EXT= {- $target{exe_extension} -}
 ARFLAGS= {- $target{arflags} -}