X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot;h=f47bdf649134f1c2fea3e73f77f72c0c42618872;hb=1e70cb6e14de98a75207796a2fb8eb7de03ea779;hp=6683ad569825267e3f488b77a5d9c3cf5e905bc9;hpb=0e17d4498cc037d5c18d33fcc4a4885778d266c0;p=ghc-hetmet.git

diff --git a/boot b/boot
index 6683ad5..f47bdf6 100644
--- a/boot
+++ b/boot
@@ -4,6 +4,21 @@ use strict;
 
 use Cwd;
 
+my %required_tag;
+
+$required_tag{"-"} = 1;
+
+while ($#ARGV ne -1) {
+    my $arg = shift @ARGV;
+
+    if ($arg =~ /^--required-tag=(.*)/) {
+        $required_tag{$1} = 1;
+    }
+    else {
+        die "Bad arg: $arg";
+    }
+}
+
 # Create libraries/*/{ghc.mk,GNUmakefile}
 system("/usr/bin/perl", "-w", "boot-pkgs") == 0
     or die "Running boot-pkgs failed: $?";
@@ -21,13 +36,13 @@ while (<PACKAGES>) {
     if (/^#/) {
         # Comment; do nothing
     }
-    elsif (/^([a-zA-Z0-9\/.-]+) *([^ ]+) *[^ ]+ *[^ ]+$/) {
+    elsif (/^([a-zA-Z0-9\/.-]+) +([^ ]+) +[^ ]+ +[^ ]+ +[^ ]+$/) {
         $dir = $1;
         $tag = $2;
         
         # If $tag is not "-" then it is an optional repository, so its
         # absence isn't an error.
-        if ($tag eq "-") {
+        if (defined($required_tag{$tag})) {
             # We would like to just check for an _darcs directory here,
             # but in an lndir tree we avoid making _darcs directories,
             # so it doesn't exist. We therefore require that every repo
@@ -57,6 +72,8 @@ foreach $dir (".", glob("libraries/*/")) {
 
 # Alas, darcs doesn't handle file permissions, so fix a few of them.
 for my $file ("boot", "darcs-all", "validate") {
-    chmod 0755, $file if -f $file
-        or die "Can't chmod 0755 $file: $!";
+    if (-f $file) {
+        chmod 0755, $file
+            or die "Can't chmod 0755 $file: $!";
+    }
 }