summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-10-14 14:05:56 +0000
committerIan Lynagh <igloo@earth.li>2010-10-14 14:05:56 +0000
commit26b6eac2c4d9409e625c1c4fd325a76076d5cd26 (patch)
tree90ba4926819eda0f22fdc9da15abe94ed3398c00
parent0a435635320c2fb075694b52ddbce5bb792110f5 (diff)
downloadhaskell-26b6eac2c4d9409e625c1c4fd325a76076d5cd26.tar.gz
Have boot check that we have the dph packages when validating
-rw-r--r--boot17
-rw-r--r--validate2
2 files changed, 17 insertions, 2 deletions
diff --git a/boot b/boot
index 54209af7d6..aa3b82d04a 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: $?";
@@ -27,7 +42,7 @@ while (<PACKAGES>) {
# 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
diff --git a/validate b/validate
index 4fd449546d..c2954f2876 100644
--- a/validate
+++ b/validate
@@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- /usr/bin/perl -w boot
+ /usr/bin/perl -w boot --required-tag=dph
./configure --prefix="$INSTDIR" $config_args
fi