[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_1-stable has been updated
       via  d724616f682cb374b613d7fbd57e4c2bf749469c (commit)
      from  d27f073bf5b1a88eed63c2aa919974e1fad04985 (commit)


- Log -----------------------------------------------------------------
commit d724616f682cb374b613d7fbd57e4c2bf749469c
Author: Dr Stephen Henson <steve at openssl.org>
Date:   Tue Dec 8 19:10:48 2015 +0000

    Don't use applink for static builds.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 10119938215298ad414468e7c2779d7fd1a0b979)

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

Summary of changes:
 util/pl/VC-32.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index e5abb97..88f0f7a 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -345,9 +345,13 @@ sub do_link_rule
 	$ret.="$target: $files $dep_libs";
 	if ($standalone == 1)
 		{
-		$ret.=" \$(OBJ_D)${o}applink.obj\n";
+		$ret.=" \$(OBJ_D)${o}applink.obj" if $shlib;
+		$ret.="\n";
 		$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
-		$ret.= "\$(EX_LIBS) \$(OBJ_D)${o}applink.obj " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
+		if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild) {
+			$ret.= "\$(EX_LIBS) ";
+			$ret.= "\$(OBJ_D)${o}applink.obj " if $shlib;
+		}
 		$ret.="$files $libs\n<<\n";
 		}
 	elsif ($standalone == 2)