diff options
author | Andy Polyakov <appro@openssl.org> | 2016-02-03 18:21:00 +0100 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2016-02-11 20:58:10 +0100 |
commit | d44bb1c31ca00f4359090daa15659c0dd1a08f0d (patch) | |
tree | 7d1bbe3349003f9dc150950e644cd29ba8eceb49 /util/pl/BC-32.pl | |
parent | 4ef29667abafae1726269fa1b4397443792d0326 (diff) | |
download | openssl-d44bb1c31ca00f4359090daa15659c0dd1a08f0d.tar.gz |
util/mk1mf.pl: use LINK_CMD instead of LINK variable.
Trouble is that LINK variable assignment in make-file interferes with
LINK environment variable, which can be used to modify Microsoft's
LINK.EXE behaviour.
RT#4289
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'util/pl/BC-32.pl')
-rw-r--r-- | util/pl/BC-32.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index 98bd0ffcd2..59a597d144 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -143,7 +143,7 @@ ___ { local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':''; $ex.=' ws2_32.lib gdi32.lib'; - $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; + $ret.="\t\$(LINK_CMD) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; } $ret.="\n"; return($ret); @@ -157,7 +157,7 @@ sub do_link_rule $file =~ s/\//$o/g if $o ne '/'; $n=&bname($target); $ret.="$target: $files $dep_libs\n"; - $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n"; + $ret.="\t\$(LINK_CMD) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n"; return($ret); } |