Commit 978c8aa8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Link in applink with fips_premain_dso 



PR#4042

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit d62c64b9)
parent 72ac9823

util/pl/VC-32.pl

+5 −2
Original line number Diff line number Diff line
@@ -342,15 +342,17 @@ sub do_link_rule 
	local($ret,$_);

	$file =~ s/\//$o/g if $o ne '/';

	$n=&bname($target);

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

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

	if ($standalone == 1)

		{

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

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

		$ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);

		$ret.= "\$(EX_LIBS) \$(OBJ_D)${o}applink.obj " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);

		$ret.="$files $libs\n<<\n";

		}

	elsif ($standalone == 2)

		{

		$ret.="\n";

		$ret.="\tSET FIPS_LINK=\$(LINK)\n";

		$ret.="\tSET FIPS_CC=\$(CC)\n";

		$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
@@ -363,6 +365,7 @@ sub do_link_rule 
		}

	else

		{

		$ret.="\n";

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

		$ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";

		}