From: Dr Stephen Henson <steve@openssl.org>
Date: Tue, 8 Dec 2015 19:10:48 +0000 (+0000)
Subject: Don't use applink for static builds.
X-Git-Tag: OpenSSL_1_0_2f~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9501418ea2287658d1a11ce888ff97fa49e9164d;p=oweals%2Fopenssl.git

Don't use applink for static builds.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 284fe0381e..0f5547f056 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -361,9 +361,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)