Skip to content
Permalink
Browse files

Assorted fixes to get Configure.pl working on Windows

  • Loading branch information...
patzim committed Jun 1, 2019
1 parent bf1bf73 commit 02e7870078cf053935c3133340b7185b935a9d37
Showing with 5 additions and 3 deletions.
  1. +5 −3 tools/lib/NQP/Config/Rakudo.pm
@@ -22,16 +22,18 @@ sub configure_nqp {
defined( $self->opt('prefix') || $self->opt('sysroot') );

if ( $nqp_bin = $self->opt('with-nqp') ) {
$nqp_bin = File::Spec->rel2abs( $self->nfp( $nqp_bin ) );

$self->sorry( "Could not find nqp '"
. $self->opt('with-nqp')
. "' defined with --with-nqp" )
unless -x $nqp_bin;
my $nqp_backend;
run(
command =>
[ $nqp_bin, '-e', 'print(nqp::getcomp("nqp").backend.name)' ],
[ $nqp_bin, '-e', 'print(nqp::getcomp(\'nqp\').backend.name)' ],
buffer => \$nqp_backend
) or self->sorry("Could not get backend information from '$nqp_bin'");
) or $self->sorry("Could not get backend information from '$nqp_bin'");
$self->use_backend($nqp_backend);
$self->backend_config( $nqp_backend, nqp_bin => $nqp_bin );
my $passed_backends = $self->opt('backends');
@@ -315,7 +317,7 @@ sub configure_moar_backend {
# . ' $(PREFIX)'
# . $slash . 'bin';
$config->{m_install} = "\t"
. q<$(CP) @nfpq(@moar::libdir@/@moar::moar@) @nfpq($(DESTDIR)$(PREFIX)/bin)@>;
. q<$(CP) @nfpq(@moar::libdir@/@moar::moar@)@ @nfpq($(DESTDIR)$(PREFIX)/bin)@>;
}
if ( $nqp_config->{'moar::os'} eq 'mingw32' ) {
$config->{'mingw_unicode'} = '-municode';

0 comments on commit 02e7870

Please sign in to comment.
You can’t perform that action at this time.