Update NQP::Configure to handle Win32 open oddities.

rakudo · Jun 9, 2011 · 1a64e24 · 1a64e24
1 parent fb4a373
commit 1a64e24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tools/build/NQP_REVISION b/tools/build/NQP_REVISION
@@ -1 +1 @@
-2011.05-50-gb4ae484
+2011.05-51-geeb63e9
diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm
@@ -84,7 +84,7 @@ sub read_config {
             while (<$CONFIG>) {
                 if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
             }
-            close($CONFIG) or die $!;
+            close($CONFIG);
         }
         last if %config;
     }
@@ -123,18 +123,18 @@ END
 
     for my $file (@parrot_config_src) {
         no warnings;
-        if (open my $PARROT, '-|', "$file parrot-config.pir") {
-            while (<$PARROT>) {
-                if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
-            }
-            close($PARROT) or die $!;
-        }
-        elsif (-r $file && open my $PARROT_CONFIG, '<', $file) {
+        if ($file =~ /.pir$/ && open my $PARROT_CONFIG, '<', $file) {
             while (<$PARROT_CONFIG>) {
                 if (/P0\["(.*?)"\], "(.*?)"/) { $config{"parrot::$1"} = $2 }
             }
             close($PARROT_CONFIG) or die $!;
         }
+        elsif (open my $PARROT, '-|', "$file parrot-config.pir") {
+            while (<$PARROT>) {
+                if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
+            }
+            close($PARROT);
+        }
         last if %config;
     }
     unlink('parrot-config.pir');