Merge pull request #582 from donaldh/configure

Unbust Makefile generation in Configure.pl.

Configure.pl

@@ -151,6 +151,18 @@
         }
     }
 
+    for my $target (qw/common_bootstrap_sources moar_core_sources/) {
+        open my $FILELIST, '<', "tools/build/$target"
+            or die "Cannot read 'tools/build/$target': $!";
+        my @lines;
+        while (<$FILELIST>) {
+            chomp;
+            push @lines, "  $_\\\n";
+        }
+        close $FILELIST;
+        $config{$target} = join '', @lines;
+    }
+
     open my $MAKEFILE, '>', 'Makefile'
         or die "Cannot open 'Makefile' for writing: $!";
 
@@ -171,18 +183,6 @@
         print $MAKEFILE "$t: ", join(' ', map "$_-$t", @prefixes), "\n";
     }
 
-    for my $target (qw/common_bootstrap_sources moar_core_sources/) {
-        open my $FILELIST, '<', "tools/build/$target"
-            or die "Cannot read 'tools/build/$target': $!";
-        my @lines;
-        while (<$FILELIST>) {
-            chomp;
-            push @lines, "  $_\\\n";
-        }
-        close $FILELIST;
-        $config{$target} = join '', @lines;
-    }
-
     fill_template_file('tools/build/Makefile-common-rules.in', $MAKEFILE, %config);
 
     # determine the version of NQP we want