make it a bit more windows-safe

rakudo-p5 · Jan 24, 2014 · 63df63d · 63df63d
1 parent 7b72147
commit 63df63d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Configure.p6 b/Configure.p6
@@ -2,14 +2,16 @@
 
 use v6;
 my $devnull     = IO::Spec.devnull;
-my $have_parrot = shell("perl6-p -e 1 >$devnull 2>$devnull").status == 0;
+my $have_parrot = 0;
 my $have_moar   = shell("perl6-m -e 1 >$devnull 2>$devnull").status == 0;
 my $have_jvm    = 0;
 
 # That goes into the Makefile.
 my %config =
     p_perl6        => "PERL6LIB={cwd}/lib perl6-p",
     m_perl6        => "PERL6LIB={cwd}/lib perl6-m",
+    m_nqplib       => qqx{nqp-m -e "nqp::print(nqp::backendconfig<prefix> ~ '/languages/nqp')"},
+    m_p6lib        => qqx{perl6-m -e "print \%*CUSTOM_LIB<perl>"},
     p_modules      => '',
     m_modules      => '',
     p_modules_list => '',

diff --git a/build/Makefile-Moar.in b/build/Makefile-Moar.in
@@ -1,7 +1,7 @@
-M_NQP    := nqp-m
-M_PERL6  := @m_perl6@
-M_NQPLIB := $(shell $(M_NQP) -e 'print(nqp::backendconfig<prefix> ~ "/languages/nqp");')
-M_P6LIB  := $(shell $(M_PERL6) -e 'print %*CUSTOM_LIB<perl>')
+M_NQP    = nqp-m
+M_PERL6  = @m_perl6@
+M_NQPLIB = @m_nqplib@
+M_P6LIB  = @m_p6lib@
 
 M_HARNESS_WITH_FUDGE = $(PERL) t/harness --fudge --keem-exit-code --add_use_v5