Skip to content

Commit

Permalink
[jvm] Don't pass --nqp-lib=blib in 'make install'
Browse files Browse the repository at this point in the history
This unbreaks the installed versions of perl6 and perl6-j.
  • Loading branch information
usev6 committed Nov 22, 2017
1 parent 0a24efc commit f40c381
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/build/Makefile-JVM.in
Expand Up @@ -230,11 +230,11 @@ j-install: j-all tools/build/create-jvm-runner.pl tools/build/install-core-dist.
$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/upgrade-repository.pl $(DESTDIR)$(PERL6_LANG_DIR)/site
.@slash@$(J_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR)
$(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
$(PERL5) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
$(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
$(PERL5) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)

j-runner-default-install: j-install
$(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) --nqp-lib=blib $(NQP_JARS)
$(PERL5) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) "" $(NQP_JARS)
$(CP) $(DESTDIR)$(PREFIX)/bin/perl6-j$(J_BAT) $(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT)
$(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6$(J_BAT)

Expand Down

0 comments on commit f40c381

Please sign in to comment.