The branch OpenSSL_1_0_2-stable has been updated
via 9501418ea2287658d1a11ce888ff97fa49e9164d (commit)
from 50b255a260837fcb38d973e887d5321fd05d8b42 (commit)
- Log -----------------------------------------------------------------
commit 9501418ea2287658d1a11ce888ff97fa49e9164d
Author: Dr Stephen Henson <st...@openssl.org>
Date: Tue Dec 8 19:10:48 2015 +0000
Don't use applink for static builds.
Reviewed-by: Rich Salz <rs...@openssl.org>
-----------------------------------------------------------------------
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 284fe03..0f5547f 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)
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
