Skip to content
Snippets Groups Projects
Commit a91df48b authored by Ian Lynagh's avatar Ian Lynagh
Browse files

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.
parent ae587ec8
No related branches found
No related tags found
No related merge requests found
...@@ -5,8 +5,10 @@ use strict; ...@@ -5,8 +5,10 @@ use strict;
use Cwd; use Cwd;
my %required_tag; my %required_tag;
my $validate;
$required_tag{"-"} = 1; $required_tag{"-"} = 1;
$validate = 0;
while ($#ARGV ne -1) { while ($#ARGV ne -1) {
my $arg = shift @ARGV; my $arg = shift @ARGV;
...@@ -14,6 +16,9 @@ while ($#ARGV ne -1) { ...@@ -14,6 +16,9 @@ while ($#ARGV ne -1) {
if ($arg =~ /^--required-tag=(.*)/) { if ($arg =~ /^--required-tag=(.*)/) {
$required_tag{$1} = 1; $required_tag{$1} = 1;
} }
elsif ($arg =~ /^--validate$/) {
$validate = 1;
}
else { else {
die "Bad arg: $arg"; die "Bad arg: $arg";
} }
...@@ -70,3 +75,19 @@ foreach $dir (".", glob("libraries/*/")) { ...@@ -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
}
...@@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then ...@@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then
INSTDIR=`cygpath -m "$INSTDIR"` INSTDIR=`cygpath -m "$INSTDIR"`
fi fi
/usr/bin/perl -w boot --required-tag=dph /usr/bin/perl -w boot --validate --required-tag=dph
./configure --prefix="$INSTDIR" $config_args ./configure --prefix="$INSTDIR" $config_args
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment