summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-04-14 22:45:02 +0100
committerIan Lynagh <igloo@earth.li>2011-04-14 22:45:02 +0100
commit2555743c2b9d7408e8cf6f0fd1064651b37db08e (patch)
treedacd80995745970cfdb8509df1871d847730b88f
parent734ebccb84c665f808b80b72aecef7fc75466204 (diff)
downloadhaskell-2555743c2b9d7408e8cf6f0fd1064651b37db08e.tar.gz
Check for ^M in packages file when booting
If we find one then we print an error message and fail.
-rwxr-xr-xboot18
1 files changed, 18 insertions, 0 deletions
diff --git a/boot b/boot
index 9d7eb38d80..66bff3eb8f 100755
--- a/boot
+++ b/boot
@@ -24,6 +24,24 @@ while ($#ARGV ne -1) {
}
}
+{
+ local $/ = undef;
+ open FILE, "packages" or die "Couldn't open file: $!";
+ binmode FILE;
+ my $string = <FILE>;
+ close FILE;
+
+ if ($string =~ /\r/) {
+ print STDERR <<EOF;
+Found ^M in packages.
+Perhaps you need to run
+ git config --global core.autocrlf false
+and re-check out the tree?
+EOF
+ exit 1;
+ }
+}
+
# Create libraries/*/{ghc.mk,GNUmakefile}
system("/usr/bin/perl", "-w", "boot-pkgs") == 0
or die "Running boot-pkgs failed: $?";