From d724616f682cb374b613d7fbd57e4c2bf749469c Mon Sep 17 00:00:00 2001 From: Dr Stephen Henson Date: Tue, 8 Dec 2015 19:10:48 +0000 Subject: [PATCH] Don't use applink for static builds. Reviewed-by: Rich Salz (cherry picked from commit 10119938215298ad414468e7c2779d7fd1a0b979) --- 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 e5abb97390..88f0f7a770 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) -- 2.34.1