Make fipscanisteronly auto detect work on WIN32.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 21 Apr 2011 16:58:51 +0000 (16:58 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 21 Apr 2011 16:58:51 +0000 (16:58 +0000)
util/mk1mf.pl
util/mkfiles.pl

index afad229..eec5d41 100755 (executable)
@@ -58,7 +58,8 @@ my %mf_import = (
        RMD160_ASM_OBJ => \$mf_rmd_asm,
        WP_ASM_OBJ     => \$mf_wp_asm,
        CMLL_ENC       => \$mf_cm_asm,
-       MODES_ASM_OBJ  => \$mf_modes_asm
+       MODES_ASM_OBJ  => \$mf_modes_asm,
+       FIPSCANISTERONLY  => \$mf_fipscanisteronly
 );
 
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -74,6 +75,13 @@ close(IN);
 
 $debug = 1 if $mf_platform =~ /^debug-/;
 
+if ($mf_fipscanisteronly eq "y") {
+       $fips = 1;
+       $fipscanisterbuild = 1;
+       $fipscanisteronly = 1;
+}
+
+
 die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
 
 $infile="MINFO";
index 1c8493a..94ab502 100755 (executable)
@@ -155,7 +155,7 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
-if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/)
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
        {
        $fipscanisteronly = 1;
        }