Skip to content

Commit

Permalink
Make compiler recognize RAKU_HOME environment variable
Browse files Browse the repository at this point in the history
- Fix a Raku-style mistype

- Get back m_install for Windows

  It's there really for a reason: Rakudo.pm sets it only if needed.
  • Loading branch information
vrurg committed Nov 23, 2019
1 parent ab0a6d6 commit dfeb712
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/main.nqp
Expand Up @@ -32,6 +32,7 @@ my $install-dir := $execname eq ''
!! nqp::substr($execname, 0, nqp::rindex($execname, $sep, nqp::rindex($execname, $sep) - 1));

my $perl6-home := $comp.config<static_perl6_home>
// nqp::getenvhash<RAKU_HOME>
// nqp::getenvhash()<PERL6_HOME>
// $install-dir ~ '/share/perl6';
if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
Expand Down
2 changes: 1 addition & 1 deletion tools/lib/NQP/Config/Rakudo.pm
Expand Up @@ -760,7 +760,7 @@ sub _m_for_toolchain {

$self->not_in_context( toolchain => 'toolchain' );

my @tools = @{ $cfg->prop('toolchains') || () };
my @tools = @{ $cfg->prop('toolchains') || [] };
my $out = "";

for my $tool (@tools) {
Expand Down
2 changes: 1 addition & 1 deletion tools/templates/moar/Makefile.in
Expand Up @@ -213,7 +213,7 @@ $(R_SETTING_MOAR): @bsm(PERL6)@@for_specs( @bsm(SETTING_@ucspec@)@)@ $(R_SETTING
@noecho@$(CP) @bpm(INST_PERL6_M)@ @nfpq($(DESTDIR)$(PREFIX)/bin/@bpm(RAKU_M)@)@
@noecho@$(CP) @bpm(INST_PERL6_DEBUG_M)@ @nfpq($(DESTDIR)$(PREFIX)/bin/@bpm(RAKU_DEBUG_M)@)@
@if(platform!=windows @for_langalias(@for_toolchain(@insert(Makefile-install)@)@)@
)@@if(platform==windows @tab@@noecho@$(CP) @nfpq(@moar::libdir@/@moar::moar@)@ @nfpq($(DESTDIR)$(PREFIX)/bin)@)@
)@@if(platform==windows @m_install@)@

@backend_prefix@-install-post::
@expand(@clean_old_p6_libs@)@
Expand Down

0 comments on commit dfeb712

Please sign in to comment.