X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=boot-pkgs;h=de3008cf92882db7731ae608a47877952b6c8ae5;hp=45520888086a08e2ba4125241c2c79703fc30036;hb=4c1f0681d85da48deaf706c0f05d971deb48261f;hpb=1c1ed8694bdd24b003fa5935d001a1835e9b0f4e

diff --git a/boot-pkgs b/boot-pkgs
index 4552088..de3008c 100644
--- a/boot-pkgs
+++ b/boot-pkgs
@@ -25,7 +25,13 @@ for $tarball (@tarballs) {
     if (-d "libraries/$package/_darcs") {
         print "Ignoring libraries/$package as it looks like a darcs checkout\n"
     }
+    elsif (-d "libraries/$package/.git") {
+        print "Ignoring libraries/$package as it looks like a git checkout\n"
+    }
     else {
+        if (! -d "libraries/stamp") {
+            mkdir "libraries/stamp";
+        }
         $stamp = "libraries/stamp/$package";
         if ((! -d "libraries/$package") || (! -f "$stamp")
          || ((-M "libraries/stamp/$package") > (-M $tarball))) {
@@ -54,6 +60,7 @@ for $package (glob "libraries/*/") {
             or die "Failed to open $pkgs: $!";
         while (<PKGS>) {
             chomp;
+            s/\r//g;
             if (/.+/) {
                 push @library_dirs, "$package/$_";
             }