Skip to content
Permalink
Browse files

Make executables generated during the build work again.

  • Loading branch information...
patzim committed Jan 13, 2019
1 parent f20a2b6 commit 98a0df6ef4428ac062bbb8532bfc9450cfc12761
Showing with 10 additions and 9 deletions.
  1. +6 −6 tools/build/Makefile-Moar.in
  2. +1 −0 tools/build/Makefile-common-macros.in
  3. +3 −3 tools/build/create-moar-runner.p6
@@ -185,7 +185,7 @@ $(R_SETTING_MOAR): $(PERL6_MOAR) $(SETTING_MOAR) $(R_SETTING_SRC) $(SETTING_MOAR

$(M_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_RUNNER)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-m . "" --nqp-lib=blib norelocatable . blib "$(M_LIBPATH)"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-m . "" --nqp-lib=blib norelocatable $(PERL6_HOME) $(NQP_HOME) . blib "$(M_LIBPATH)"
-$(CHMOD) 755 $(M_RUNNER)

m-runner-default: $(M_RUNNER)
@@ -199,21 +199,21 @@ $(PERL6_DEBUG_MOAR): src/perl6-debug.nqp $(PERL6_MOAR)
--vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init $(M_BUILD_DIR)/perl6-debug.nqp

$(M_DEBUG_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_DEBUG_MOAR) $(SETTING_MOAR)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm perl6-debug-m . "" --nqp-lib=blib norelocatable . blib "$(M_LIBPATH)"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm perl6-debug-m . "" --nqp-lib=blib norelocatable $(PERL6_HOME) $(NQP_HOME) . blib "$(M_LIBPATH)"

$(M_GDB_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_GDB_RUNNER)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-gdb-m . "gdb" --nqp-lib=blib norelocatable . blib "$(M_LIBDEFPATH)" "$(M_LIBPATH)"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-gdb-m . "gdb" --nqp-lib=blib norelocatable $(PERL6_HOME) $(NQP_HOME) . blib "$(M_LIBDEFPATH)" "$(M_LIBPATH)"
-$(CHMOD) 755 $(M_GDB_RUNNER)

$(M_LLDB_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_LLDB_RUNNER)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-lldb-m . "lldb" --nqp-lib=blib norelocatable . blib "$(M_LIBPATH)"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-lldb-m . "lldb" --nqp-lib=blib norelocatable $(PERL6_HOME) $(NQP_HOME) . blib "$(M_LIBPATH)"
-$(CHMOD) 755 $(M_LLDB_RUNNER)

$(M_VALGRIND_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR)
$(RM_F) $(M_VALGRIND_RUNNER)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-valgrind-m . "valgrind" --nqp-lib=blib norelocatable . blib "$(M_LIBPATH)"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-valgrind-m . "valgrind" --nqp-lib=blib norelocatable $(PERL6_HOME) $(NQP_HOME) . blib "$(M_LIBPATH)"
-$(CHMOD) 755 $(M_VALGRIND_RUNNER)

$(M_C_RUNNER): src/vm/moar/runner/main.c
@@ -316,7 +316,7 @@ m-install: m-all tools/build/create-moar-runner.p6 tools/build/install-core-dist
.@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_HOME)/site
.@slash@$(M_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_HOME)
$(CP) $(M_C_RUNNER) $(DESTDIR)$(PREFIX)/bin/perl6-m@exe@
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_HOME)/runtime" "" "" relocatable "$(M_LIBPATH)" "$(PERL6_HOME)/lib" "$(PERL6_HOME)/runtime"
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_HOME)/runtime" "" "" relocatable $(PERL6_HOME) $(NQP_HOME) "$(M_LIBPATH)" "$(PERL6_HOME)/lib" "$(PERL6_HOME)/runtime"
@m_install@

m-runner-default-install: m-install
@@ -16,6 +16,7 @@ SDKROOT= @sdkroot@
PREFIX = @prefix@
LIBDIR = @libdir@
PERL6_HOME = $(LIBDIR)/perl6
NQP_HOME = $(LIBDIR)/nqp

BOOTSTRAP_SOURCES = \
src/Perl6/Metamodel/BOOTSTRAP.nqp \
@@ -2,7 +2,7 @@
# Copyright (C) 2013-2018, The Perl Foundation.

use v6;
my ($moar, $mbc, $install_to, $p6_mbc_path, $toolchain, $blib, $relocatable, @libpaths) = @*ARGS;
my ($moar, $mbc, $install_to, $p6_mbc_path, $toolchain, $blib, $relocatable, $perl6-home, $nqp-home, @libpaths) = @*ARGS;
$relocatable = $relocatable eq "relocatable";

$p6_mbc_path = $*SPEC.rel2abs($p6_mbc_path || $*SPEC.curdir);
@@ -84,9 +84,9 @@ else {
EOS
}
else {
$fh.print(sprintf(q:to/EOS/, $moar, $libpath-line));
$fh.print(sprintf(q:to/EOS/, $perl6-home, $nqp-home, $moar, $libpath-line));
#!/bin/sh
exec %s --execname="$0" %s "$@"
PERL6_HOME=%s NQP_HOME=%s exec %s --execname="$0" %s "$@"
EOS
}
$fh.close;

0 comments on commit 98a0df6

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