diff options
| author | Steve Mynott <stmuk@users.noreply.github.com> | 2018-03-09 07:41:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-09 07:41:58 +0000 |
| commit | 95fc4c0376a3adb8ffd712456e1f8645b125d30a (patch) | |
| tree | 86ffd9d40f939347707d85923cd236f11853e5bf | |
| parent | 600f7d0505614bf30dceaa5e56c6e3163ab4b8b6 (diff) | |
| parent | 0abaabaf0f9510a8cc5924f5461ec7efb522d386 (diff) | |
Merge pull request #109 from rakudo/fix-panda-jvm
Swap panda to zef for JVM build
| -rw-r--r-- | tools/build/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 70793c9..e55cc25 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -56,8 +56,8 @@ modules-install: @backend_modules_install@ modules-install-j: rakudo-install @echo "== Installing modules for JVM" - cd modules/panda && @path@ $(DESTDIR)$(PERL6_J_INSTALL) bootstrap.pl" - @path@ $(PERL) tools/build/module-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)" + cd modules/zef && @path@ $(DESTDIR)$(PERL6_J_INSTALL) -Ilib bin/zef install ." + @path@ $(PERL) tools/build/module-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/zef-m $(MODULES)" modules-install-m: rakudo-install @echo "== Installing modules for MoarVM" @@ -152,4 +152,3 @@ msi: cmd /c candle star-files.wxs cmd /c candle -dSTARVERSION=$(STAR_VERSION) tools/build/star-product.wxs cmd /c light -b $(PREFIX_DIR) -ext WixUIExtension star-files.wixobj star-product.wixobj -o rakudo-star-$(STAR_VERSION).msi - |