-
-
Save FROGGS/fdbfe209806fba0587ad to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/dev/rakudo$ git diff | |
diff --git a/Configure.pl b/Configure.pl | |
index 2a7d42b..e41097b 100644 | |
--- a/Configure.pl | |
+++ b/Configure.pl | |
@@ -34,6 +34,7 @@ MAIN: { | |
GetOptions(\%options, 'help!', 'prefix=s', | |
'backends=s', 'no-clean!', | |
'gen-nqp:s', | |
+ 'gen-moar:s', | |
'gen-parrot:s', 'parrot-option=s@', | |
'parrot-make-option=s@', | |
'make-install!', 'makefile-timing!', | |
diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm | |
index ce6cd93..226e86e 100644 | |
--- a/tools/lib/NQP/Configure.pm | |
+++ b/tools/lib/NQP/Configure.pm | |
@@ -272,6 +272,7 @@ sub gen_nqp { | |
my $backends = $options{'backends'}; | |
my $gen_nqp = $options{'gen-nqp'}; | |
+ my $gen_moar = $options{'gen-moar'}; | |
my $gen_parrot = $options{'gen-parrot'}; | |
my $prefix = $options{'prefix'} || cwd().'/install'; | |
my $startdir = cwd(); | |
@@ -321,7 +322,7 @@ sub gen_nqp { | |
return %impls unless %need; | |
- if (defined $gen_nqp || defined $gen_parrot) { | |
+ if (defined $gen_nqp || defined $gen_parrot || defined $gen_moar) { | |
git_checkout($nqp_git, 'nqp', $gen_nqp || $nqp_want, $nqp_push); | |
} | |
@@ -339,6 +340,11 @@ sub gen_nqp { | |
my $backends_to_build = join ',', sort keys %need; | |
my @cmd = ($^X, 'Configure.pl', "--prefix=$prefix", | |
"--backends=$backends", "--make-install"); | |
+ | |
+ if (defined $gen_moar) { | |
+ push @cmd, $gen_moar ? '--gen-moar' : "--gen-moar=$gen_moar"; | |
+ } | |
+ | |
print "Building NQP ...\n"; | |
chdir("$startdir/nqp"); | |
print "@cmd\n"; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment