diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-30 19:18:41 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-30 19:18:41 +0000 |
commit | 01f06617b113932c06523cbd89e5272dce2fda34 (patch) | |
tree | b7865fbad3ecc3d5f2579bbce2b9ae5ce1cb2651 | |
parent | be6ddecb8b88c33b2cac3c9a311110413ec70998 (diff) |
Recognise fipscheck option and call fipsas for WIN64 builds.
-rwxr-xr-x | util/mk1mf.pl | 1 | ||||
-rw-r--r-- | util/pl/VC-32.pl | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index f00909a0a3..4bf4a1aea2 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -1375,6 +1375,7 @@ sub read_options "fips" => \$fips, "fipscanisterbuild" => [\$fips, \$fipscanisterbuild], "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly], + "fipscheck" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly], ); if (exists $valid_options{$_}) diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 693adae6e4..6918e8898d 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -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 |