Skip to content
Permalink
Browse files

Fix build on linux

It seems the NQP config variable 'moar::ldimp' is '' instead of undefined
in rakudo irrespective of it being set to undef in MoarVM/build/setup.pm
where it originates. Thus the check needs to be different.
  • Loading branch information...
patzim committed Mar 27, 2019
1 parent bafa523 commit 4459364eeff0c3089548ab5833f30ff37fb60a26
Showing with 1 addition and 6 deletions.
  1. +1 −6 Configure.pl
@@ -23,11 +23,6 @@
# (not included with *every* Perl installation)
use ExtUtils::Command;

# This allows us to run on ancient perls.
sub defined_or($$) {
defined $_[0] ? $_[0] : $_[1]
}

MAIN: {
if (-r 'config.default') {
unshift @ARGV, shellwords(slurp('config.default'));
@@ -346,7 +341,7 @@ ($$)
. "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 perl6 $(M_RUNNER) $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "valgrind" "" "" ""';
}
$config{'c_runner_libs'} = join ' ', @c_runner_libs;
$config{'moar_lib'} = sprintf(defined_or($nqp_config{'moar::ldimp'}, $nqp_config{'moar::ldusr'}), $nqp_config{'moar::name'});
$config{'moar_lib'} = sprintf(($nqp_config{'moar::ldimp'} ? $nqp_config{'moar::ldimp'} : $nqp_config{'moar::ldusr'}), $nqp_config{'moar::name'});

unless (@errors) {
print "Using $config{'m_nqp'} (version $nqp_config{'nqp::version'} / MoarVM $nqp_config{'moar::version'}).\n";

0 comments on commit 4459364

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