Skip to content
Permalink
Browse files

This should fix Windows build.

Except for an internal error which has nothing to do with Makefile.

Perhaps...
  • Loading branch information...
vrurg committed Apr 9, 2019
1 parent 7d2bb28 commit 13d650422dfa1f6d11701ddd654b5a1f6339bda2
Showing with 7 additions and 2 deletions.
  1. +5 −0 tools/lib/NQP/Config/Rakudo.pm
  2. +2 −2 tools/templates/jvm/Makefile.in
@@ -85,6 +85,11 @@ sub configure_misc {
slurp( $self->template_file_path( 'PERL6_SPECS', required => 1, ) )
)
];

$config->{set_nqp_lib} = 'NQP_LIB=blib ';
if ($self->is_win) {
$config->{set_nqp_lib} = "\tset $config->{set_nqp_lib}\n";
}
}

sub configure_jvm_backend {
@@ -148,12 +148,12 @@ $(PERL6_B_JAR): $(BOOTSTRAP_SOURCES) $(PERL6_M_JAR)
$(SETTING_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(J_CORE_SOURCES)
$(J_NQP) $(J_GEN_CAT) -f @template(jvm_core_sources)@ > @nfp($(J_BUILD_DIR)/CORE.setting)@
@echo "The following step can take a long time, please be patient."
NQP_LIB=blib $(J_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) --nqp-lib=blib @nfp($(J_BUILD_DIR)/CORE.setting)@
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) --nqp-lib=blib @nfp($(J_BUILD_DIR)/CORE.setting)@

$(SETTING_D_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(SETTING_JAR) $(J_CORE_SOURCES)
$(J_NQP) $(J_GEN_CAT) $(J_CORE_D_SOURCES) > @nfp($(J_BUILD_DIR)/CORE.d.setting)@
@echo "The following step can take a long time, please be patient."
NQP_LIB=blib $(J_RUN_PERL6) --setting=NULL.d --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_D_JAR) --nqp-lib=blib @nfp($(J_BUILD_DIR)/CORE.d.setting)@
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL.d --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_D_JAR) --nqp-lib=blib @nfp($(J_BUILD_DIR)/CORE.d.setting)@

$(J_RUNNER): @script(create-jvm-runner.pl)@
$(PERL5) @script(create-jvm-runner.pl)@ dev . . $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)

0 comments on commit 13d6504

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