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/VC-32.pl | |
| parent | 4ef29667abafae1726269fa1b4397443792d0326 (diff) | |
| download | openssl-d44bb1c31ca00f4359090daa15659c0dd1a08f0d.zip openssl-d44bb1c31ca00f4359090daa15659c0dd1a08f0d.tar.gz openssl-d44bb1c31ca00f4359090daa15659c0dd1a08f0d.tar.bz2 | |
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/VC-32.pl')
| -rw-r--r-- | util/pl/VC-32.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index b9ae8a5..2c11184 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -362,7 +362,7 @@ sub do_lib_rule if ($fips && $target =~ /O_CRYPTO/) { $ret.="$target: $objs \$(PREMAIN_DSO_EXE)"; - $ret.="\n\tSET FIPS_LINK=\$(LINK)\n"; + $ret.="\n\tSET FIPS_LINK=\$(LINK_CMD)\n"; $ret.="\tSET FIPS_CC=\$(CC)\n"; $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n"; @@ -376,7 +376,7 @@ sub do_lib_rule else { $ret.="$target: $objs"; - $ret.="\n\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n"; + $ret.="\n\t\$(LINK_CMD) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n"; } $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n"; @@ -394,13 +394,13 @@ sub do_link_rule $ret.="$target: $files $dep_libs\n"; if ($standalone == 1) { - $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; + $ret.=" \$(LINK_CMD) \$(LFLAGS) $efile$target @<<\n\t"; $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); $ret.="$files $libs\n<<\n"; } elsif ($standalone == 2) { - $ret.="\tSET FIPS_LINK=\$(LINK)\n"; + $ret.="\tSET FIPS_LINK=\$(LINK_CMD)\n"; $ret.="\tSET FIPS_CC=\$(CC)\n"; $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; $ret.="\tSET PREMAIN_DSO_EXE=\n"; @@ -412,7 +412,7 @@ sub do_link_rule } else { - $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; + $ret.="\t\$(LINK_CMD) \$(LFLAGS) $efile$target @<<\n"; $ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n"; } $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n"; |