diff options
| author | steve <steve> | 2011-06-30 19:18:40 +0000 |
|---|---|---|
| committer | steve <steve> | 2011-06-30 19:18:40 +0000 |
| commit | 8515e8fb035443e16c6a0dfee8787b3eb643765b (patch) | |
| tree | 9ce5b5e034da7fc197aff0ac52a0fc357d23cf14 | |
| parent | 94621bbad73deb951e7a8e7385559cd870724cf1 (diff) | |
| download | openssl-8515e8fb035443e16c6a0dfee8787b3eb643765b.tar.gz | |
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 f00909a0a..4bf4a1aea 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 693adae6e..6918e8898 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 |