Merge branch 'qbootstrap' of github.com:rakudo/rakudo into qbootstrap

rakudo · May 26, 2012 · 12b2cd7 · 12b2cd7
2 parents 1b72f38 + 51f1b93
commit 12b2cd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -56,7 +56,7 @@
     }
 
     # --with-parrot and --gen-parrot imply --gen-nqp
-    if (!defined $gen_nqp && (defined $with_parrot || defined $gen_parrot)) {
+    if (!defined $gen_nqp && !defined $with_nqp && (defined $with_parrot || defined $gen_parrot)) {
         $gen_nqp = '';
     }
 

diff --git a/src/core/IO/ArgFiles.pm b/src/core/IO/ArgFiles.pm
@@ -2,7 +2,7 @@ my class IO::ArgFiles is IO {
     has $.args;
     has $.filename;
     has $!io;
-    has $!ins;
+    has $.ins;
 
     method eof() { 
         ! $!args && $!io.opened && $!io.eof