unlink target and retry to avoid intermittent Win32 failures

1 files changed, 9 insertions, 0 deletions

diff --git a/util/fipslink.pl b/util/fipslink.pl
index 8b6fbad7d8..262d691d1b 100644
--- a/util/fipslink.pl
+++ b/util/fipslink.pl
@@ -57,6 +57,15 @@ print "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fi
 system "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c";
 die "Second stage Compile failure" if $? != 0;
 
+my $delcnt = 0;
+# On windows the previous file doesn't always close straight away
+# so retry an unlink operation a few times if it fails.
+while (!unlink($target))
+        {
+        sleep 2;
+        die "Can't delete $target" if ($delcnt++ > 10);
+        }
+
 
 print "$fips_link @ARGV\n";
 system "$fips_link @ARGV";