Skip to content
Permalink
Browse files

Make buidl dir runners reliable wrt install directory

Change the order of the includes to prefer the ones in the build dir.
The install dir include is necessary, because the runners need the NQP
installation which usually resides in the same install location.
So the best thing to do is make sure the stuff in the build dir is included
first.
I tested this by corrupting blib/Perl6/BOOTSTRAP.moarvm and perl6.moarvm
in the install and build directory respectively to be sure which one is
included first.
  • Loading branch information...
patzim committed Apr 15, 2019
1 parent 9917624 commit 249c730eff1af25a62dc4997e7356bf0ffa4ce5f
Showing with 5 additions and 5 deletions.
  1. +5 −5 tools/build/Makefile-Moar.in
@@ -197,7 +197,7 @@ $(R_SETTING_MOAR): $(PERL6_MOAR) $(SETTING_MOAR) $(R_SETTING_SRC) $(SETTING_MOAR

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

m-runner-default: $(M_BAT_RUNNER)
@@ -211,21 +211,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_BAT_DEBUG_RUNNER): tools/build/create-moar-runner.p6 $(M_C_DEBUG_RUNNER) $(PERL6_DEBUG_MOAR) $(SETTING_MOAR)
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 moar "$(MOAR)" perl6-debug-m perl6-debug.moarvm \$$DIR "" $(PERL6_HOME) $(NQP_HOME) --nqp-lib=\$$DIR/blib $(M_LIBPATH) \$$DIR \$$DIR/blib
$(M_RUN_PERL6) tools/build/create-moar-runner.p6 moar "$(MOAR)" perl6-debug-m perl6-debug.moarvm \$$DIR "" $(PERL6_HOME) $(NQP_HOME) --nqp-lib=\$$DIR/blib \$$DIR \$$DIR/blib $(M_LIBPATH)

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

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

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

$(M_C_RUNNER): src/vm/moar/runner/main.c

0 comments on commit 249c730

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