Avoid stupid catfile behavior, fixing Win config.

Raku · Nov 10, 2015 · 517c8f8 · 517c8f8
1 parent d380395
commit 517c8f8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm
@@ -443,8 +443,10 @@ sub gen_moar {
     push @opts, "--optimize";
     my $startdir   = cwd();
     my $git_protocol = $options{'git-protocol'} || 'https';
-
-    my $moar_exe   = $options{'with-moar'} || File::Spec->catfile( $sdkroot, $prefix, 'bin', "moar$exe" );
+    my $moar_exe   = $options{'with-moar'} || (
+        $sdkroot
+            ? File::Spec->catfile( $sdkroot, $prefix, 'bin', "moar$exe" )
+            : File::Spec->catfile( $prefix, 'bin', "moar$exe" ));
     my $moar_have  = qx{ $moar_exe --version };
     if ($moar_have) {
         $moar_have = $moar_have =~ /version (\S+)/ ? $1 : undef;