Commit 0fffd522 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
(cherry picked from commit d44bb1c3)

Resolved conflicts:
	util/pl/VC-32.pl
parent 52464477

util/mk1mf.pl

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ EX_LIBS=$ex_libs 
# The OpenSSL directory

SRC_D=$src_dir



LINK=$link

LINK_CMD=$link

LFLAGS=$lflags

RSC=$rsc

util/pl/BC-32.pl

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,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);
@@ -132,7 +132,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);

	}

util/pl/Mingw32.pl

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ sub do_link_rule 
	$file =~ s/\//$o/g if $o ne '/';

	$n=&bname($target);

	$ret.="$target: $files $dep_libs\n";

	$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";

	$ret.="\t\$(LINK_CMD) ${efile}$target \$(LFLAGS) $files $libs\n\n";

	return($ret);

	}

1;

util/pl/OS2-EMX.pl

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ sub do_lib_rule 
		{

		local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';

		$ex.=' -lsocket';

		$ret.="\t\$(LINK) \$(SHLIB_CFLAGS) \$(MLFLAGS) $efile$target \$(SHLIB_EX_OBJ) \$(${Name}OBJ) $ex os2/${Name}.def\n";

		$ret.="\t\$(LINK_CMD) \$(SHLIB_CFLAGS) \$(MLFLAGS) $efile$target \$(SHLIB_EX_OBJ) \$(${Name}OBJ) $ex os2/${Name}.def\n";

		$ret.="\temximp -o $out_def/$name.a os2/${Name}.def\n";

		$ret.="\temximp -o $out_def/$name.lib os2/${Name}.def\n\n";

		}
@@ -113,7 +113,7 @@ sub do_link_rule 
	$file =~ s/\//$o/g if $o ne '/';

	$n=&bname($target);

	$ret.="$target: $files $dep_libs\n";

	$ret.="\t\$(LINK) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n\n";

	$ret.="\t\$(LINK_CMD) ${efile}$target \$(CFLAG) \$(LFLAGS) $files $libs\n\n";

	return($ret);

	}

util/pl/VC-32.pl

+5 −5
Original line number Diff line number Diff line
@@ -330,7 +330,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";
@@ -344,7 +344,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";

		}
@@ -363,7 +363,7 @@ sub do_link_rule 
		{

		$ret.=" \$(OBJ_D)${o}applink.obj" if $shlib;

		$ret.="\n";

		$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";

		$ret.="  \$(LINK_CMD) \$(LFLAGS) $efile$target @<<\n\t";

		if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild) {

			$ret.= "\$(EX_LIBS) ";

			$ret.= "\$(OBJ_D)${o}applink.obj " if $shlib;
@@ -373,7 +373,7 @@ sub do_link_rule 
	elsif ($standalone == 2)

		{

		$ret.="\n";

		$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";
@@ -386,7 +386,7 @@ sub do_link_rule 
	else

		{

		$ret.="\n";

		$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";