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:27 +0000 |
| commit | d724616f682cb374b613d7fbd57e4c2bf749469c (patch) | |
| tree | 16ec08999482e072e9a6fb5d83f0c1d9330f407c /util | |
| parent | d27f073bf5b1a88eed63c2aa919974e1fad04985 (diff) | |
Don't use applink for static builds.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 10119938215298ad414468e7c2779d7fd1a0b979)
Diffstat (limited to 'util')
| -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 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) |