Skip to content

Commit

Permalink
Merge pull request #3480 from vrurg/rakudo_3478
Browse files Browse the repository at this point in the history
Added *_RUNNER_OPTS variable
  • Loading branch information
vrurg committed Feb 13, 2020
2 parents 5685648 + 701c38d commit fbeb3e3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
9 changes: 5 additions & 4 deletions tools/templates/Makefile-backend-common.in
Expand Up @@ -74,6 +74,7 @@
@bpv(PERL6_BOOTSTRAP_PRECOMPS)@ =@for_specs( @bsm(PERL6_BOOTSTRAP_@ucspec@)@)@

@bpv(RUNNER)@ = perl6-@backend_abbr@@bpm(RUNNER_SUFFIX)@
@bpv(RUNNER_OPTS)@ = --ll-exception

@bsv(PERL6_DEBUG)@ = perl6-debug.@bext@
@bsv(RAKUDO_DEBUG)@ = rakudo-debug.@bext@
Expand Down Expand Up @@ -223,10 +224,10 @@ check_@backend_abbr@_nqp_version: @@script(check-nqp-version.pl)@@

@backend_prefix@-install-post:: @@script(install-core-dist.raku)@@
@echo(+++ Preparing installation)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/core)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/vendor)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(upgrade-repository.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/site)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @shquot(@script(install-core-dist.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/core)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @bpm(RUNNER_OPTS)@ @shquot(@script(upgrade-repository.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/core)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @bpm(RUNNER_OPTS)@ @shquot(@script(upgrade-repository.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/vendor)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @bpm(RUNNER_OPTS)@ @shquot(@script(upgrade-repository.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/site)@
$(NOECHO)@nfpq($(BASE_DIR)/@bpm(RUNNER)@)@ @bpm(RUNNER_OPTS)@ @shquot(@script(install-core-dist.raku)@)@ @nfpq($(DESTDIR)$(RAKUDO_HOME)/core)@

@backend_prefix@-install:: @backend_prefix@-all @backend_prefix@-install-pre @backend_prefix@-install-main @backend_prefix@-install-post
@echo(+++ @uc(@backend@)@ BACKEND INSTALLED)@
1 change: 0 additions & 1 deletion tools/templates/moar/Makefile.in
Expand Up @@ -30,7 +30,6 @@ R_SETTING_MOAR = RESTRICTED.setting.moarvm
@bpm(CCINC)@@nfpq(@bpm(INCPATH)@/libtommath)@ \
@bpm(CCINC)@@nfpq(@bpm(INCPATH)@/libuv)@

#@bpv(RUNNER)@ = perl6-m@moar::exe@
@bpv(PERL6)@ = perl6@moar::exe@
@bpv(PERL6_DEBUG)@ = perl6-debug@moar::exe@
@bpv(PERL6_M)@ = perl6-m@moar::exe@
Expand Down

0 comments on commit fbeb3e3

Please sign in to comment.