summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-04-14 19:56:51 +0100
committerIan Lynagh <igloo@earth.li>2011-04-14 20:37:13 +0100
commita91df48bcf1a06dde529812c44bbceaee7c1fb10 (patch)
tree9d79d1e1ff2a0925aa64284889dd5c04d1ed6315
parentae587ec8ab4dd8414d629d3629dec0cc44b37aa7 (diff)
downloadhaskell-a91df48bcf1a06dde529812c44bbceaee7c1fb10.tar.gz
Make the boot script complain if mk/build.mk doesn't exist
If we aren't validating and mk/build.mk doesn't exist then boot prints a warning, pointing at instructions for setting up mk/build.mk.
-rwxr-xr-xboot21
-rwxr-xr-xvalidate2
2 files changed, 22 insertions, 1 deletions
diff --git a/boot b/boot
index ae57381636..9d7eb38d80 100755
--- a/boot
+++ b/boot
@@ -5,8 +5,10 @@ use strict;
use Cwd;
my %required_tag;
+my $validate;
$required_tag{"-"} = 1;
+$validate = 0;
while ($#ARGV ne -1) {
my $arg = shift @ARGV;
@@ -14,6 +16,9 @@ while ($#ARGV ne -1) {
if ($arg =~ /^--required-tag=(.*)/) {
$required_tag{$1} = 1;
}
+ elsif ($arg =~ /^--validate$/) {
+ $validate = 1;
+ }
else {
die "Bad arg: $arg";
}
@@ -70,3 +75,19 @@ foreach $dir (".", glob("libraries/*/")) {
}
}
+if ($validate eq 0 && ! -f "mk/build.mk") {
+ print <<EOF;
+
+WARNING: You don't have a mk/build.mk file.
+
+By default a standard GHC build will be done, which uses optimisation
+and builds the profiling libraries. This will take a long time, so may
+not be what you want if you are developing GHC or the libraries, rather
+than simply building it to use it.
+
+For information on creating a mk/build.mk file, please see:
+ http://hackage.haskell.org/trac/ghc/wiki/Building/Using#Buildconfiguration
+
+EOF
+}
+
diff --git a/validate b/validate
index 8d6e2c3043..b1ae14ffec 100755
--- a/validate
+++ b/validate
@@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- /usr/bin/perl -w boot --required-tag=dph
+ /usr/bin/perl -w boot --validate --required-tag=dph
./configure --prefix="$INSTDIR" $config_args
fi