Skip to content
Permalink
Browse files

Let the build dir runners access the installed comp repos

This allows the build dir runners to access the libraries of the
installation and use them.

Fixes #2969
  • Loading branch information...
patzim committed Jun 11, 2019
1 parent 75e234a commit 6c5be5e01816cc637da2c0f83698686b6b13f84f
Showing with 7 additions and 3 deletions.
  1. +4 −2 tools/templates/moar/Makefile.in
  2. +1 −1 tools/templates/moar/perl6-m.in
  3. +2 −0 tools/templates/moar/perl6-m.windows
@@ -227,7 +227,8 @@ $(M_BAT_RUNNER): @@configure_script@@ @@template(@backend_subdir@/perl6-m)@@ $(P
--set-var=mbc=perl6.moarvm \
--set-var=ctx_subdir=@backend_subdir@ \
--set-var=nqp_libdir=@shquot(@nqp::libdir@)@ \
--set-var=runner_opts=@chomp(@insert(Makefile-runner_opts)@)@
--set-var=runner_opts=@chomp(@insert(Makefile-runner_opts)@)@ \
--set-var=nqp_prefix=@nqp::prefix@
-$(CHMOD) 755 $(M_BAT_RUNNER)

$(M_BAT_DEBUG_RUNNER): @@configure_script@@ @@template(@backend_subdir@/perl6-m)@@ $(PERL6_DEBUG_MOAR) $(SETTING_MOAR)
@@ -237,7 +238,8 @@ $(M_BAT_DEBUG_RUNNER): @@configure_script@@ @@template(@backend_subdir@/perl6-m)
--set-var=mbc=perl6-debug.moarvm \
--set-var=ctx_subdir=@backend_subdir@ \
--set-var=nqp_libdir=@shquot(@nqp::libdir@)@ \
--set-var=runner_opts=@chomp(@insert(Makefile-runner_opts)@)@
--set-var=runner_opts=@chomp(@insert(Makefile-runner_opts)@)@ \
--set-var=nqp_prefix=@nqp::prefix@
-$(CHMOD) 755 $(M_BAT_DEBUG_RUNNER)

$(M_C_RUNNER): @nfp(src/vm/moar/runner/main.c)@
@@ -1,3 +1,3 @@
@insert(sh-prelude)@

exec "@expand(@MOAR@)@" @expand(@runner_opts@)@ "$@"
NQP_HOME="@nfp(@nqp_prefix@/share/nqp)@" PERL6_HOME="@nfp(@prefix@/share/perl6)@" exec "@expand(@MOAR@)@" @expand(@runner_opts@)@ "$@"
@@ -1,4 +1,6 @@
@ SET DIR=%~dp0
@ SET DIR=%DIR:~0,-1%
@ SET EXEC=%~dpf0
@ SET NQP_HOME=@nfp(@nqp_prefix@/share/nqp)@
@ SET PERL6_HOME=@nfp(@prefix@/share/perl6)@
@ "@expand(@MOAR@)@" @expand(@runner_opts@)@ %*

0 comments on commit 6c5be5e

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