diff options
| author | Dr Stephen Henson <steve@openssl.org> | 2015-12-08 19:10:48 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-12-09 00:30:29 +0000 |
| commit | 9501418ea2287658d1a11ce888ff97fa49e9164d (patch) | |
| tree | ce32259bd4f6146f3eea7fdf436e98e768eba6e6 | |
| parent | 50b255a260837fcb38d973e887d5321fd05d8b42 (diff) | |
Don't use applink for static builds.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | util/pl/VC-32.pl | 8 |
1 files changed, 6 insertions, 2 deletions
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) |