update mkerr.pl for use fips directory, add arx.pl script

2 files changed, 17 insertions, 1 deletions

diff --git a/util/arx.pl b/util/arx.pl
new file mode 100644
index 000000000..ce62625c3
--- /dev/null
+++ b/util/arx.pl
@@ -0,0 +1,15 @@
+#!/bin/perl
+
+# Simple perl script to wrap round "ar" program and exclude any
+# object files in the environment variable EXCL_OBJ
+
+map { s/^.*\/([^\/]*)$/$1/ ; $EXCL{$_} = 1} split(' ', $ENV{EXCL_OBJ});
+
+#my @ks = keys %EXCL;
+#print STDERR "Excluding: @ks \n";
+
+my @ARGS = grep { !exists $EXCL{$_} } @ARGV;	
+
+system @ARGS;
+
+exit $? >> 8;
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 15b774f27..5dd89582c 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -115,7 +115,8 @@ EOF
 }
 
 if($recurse) {
-	@source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);
+	@source = ( <crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>,
+			<fips/*.c>, <fips/*/*.c>);
 } else {
 	@source = @ARGV;
 }