aboutsummaryrefslogtreecommitdiff
path: root/tools/lib
diff options
context:
space:
mode:
authorjnthn <jnthn@jnthn.net>2014-03-15 19:15:28 +0100
committerjnthn <jnthn@jnthn.net>2014-03-15 19:15:28 +0100
commitd6042a679545c86aa9e09ea3817b4e0b081e03b1 (patch)
tree6149dfe98f8d4c3c124a870cf951f2e5610a84dc /tools/lib
parent1525fbee85276e75c288f6de497974fb06796950 (diff)
Shut up an error and get a working --gen-moar.
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/NQP/Configure.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm
index 424beea..cb95cc9 100644
--- a/tools/lib/NQP/Configure.pm
+++ b/tools/lib/NQP/Configure.pm
@@ -434,7 +434,7 @@ sub gen_moar {
my $startdir = cwd();
my $moar_exe = "$prefix/bin/moar$exe";
- my $moar_have = qx{ $moar_exe --version };
+ my $moar_have = -e $moar_exe ? qx{ $moar_exe --version } : undef;
if ($moar_have) {
$moar_have = $moar_have =~ /version (\S+)/ ? $1 : undef;
}
@@ -452,7 +452,7 @@ sub gen_moar {
my $moar_repo = git_checkout($moar_git, 'MoarVM', $gen_moar || $moar_want, $moar_push);
- unless (cmp_rev($moar_repo, $moar_want) >= 0) {
+ if (defined($moar_repo) && cmp_rev($moar_repo, $moar_want) < 0) {
die "You asked me to build $gen_moar, but $moar_repo is not new enough to satisfy version $moar_want\n";
}