Commit 01f06617 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Recognise fipscheck option and call fipsas for WIN64 builds.

parent be6ddecb

util/mk1mf.pl

+1 −0
Original line number Diff line number Diff line
@@ -1375,6 +1375,7 @@ sub read_options 
		"fips" => \$fips,

		"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],

		"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],

		"fipscheck" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],

		);



	if (exists $valid_options{$_})

util/pl/VC-32.pl

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ if ($FLAVOR =~ /WIN64/) 
\$(TMP_D)$o$bname.asm: $source

	set ASM=\$(ASM)

	\$(PERL) $source \$\@

___

	$ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n" if $fipscanisterbuild;



	$ret.=<<___;



$target: \$(TMP_D)$o$bname.asm

	\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm