diff options
| author | jnthn <jnthn@jnthn.net> | 2014-03-16 22:25:11 +0100 |
|---|---|---|
| committer | jnthn <jnthn@jnthn.net> | 2014-03-16 22:25:11 +0100 |
| commit | 3488b6c547b7613c8a9b5e8bf6c6c343bc5c93cb (patch) | |
| tree | 32682c73733c39f654b8c1f775f93b54cd6c7d38 | |
| parent | 45ea83817352fa1ef9caa86aa1b4157e6c765905 (diff) | |
Some fixes to get tri-Star build/test working.
| -rw-r--r-- | Configure.pl | 4 | ||||
| -rw-r--r-- | tools/build/Makefile.in | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Configure.pl b/Configure.pl index 02972e9..7ecc750 100644 --- a/Configure.pl +++ b/Configure.pl @@ -108,11 +108,11 @@ MAIN: { } $config{backend_exes} = join ' ', map - { '$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } + { '$(RAKUDO_DIR)/$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . - '_EXE)'; + '_INSTALL)'; unless ($backends{parrot}) { warn "JVM/Moar-only builds are currently not supported, and might go wrong.\n"; diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 6e9acc6..4d9a307 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -41,6 +41,8 @@ PERL6_M_EXE = perl6-m$(BAT) PERL6_M_LANG_DIR = $(PREFIX)/languages/perl6 PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) +PERL6_EXE = perl6$(EXE) + MODULES = modules/MODULES.txt all: rakudo @@ -59,8 +61,8 @@ rakudo-spectest: rakudo rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install - $(CP) $(DESTDIR)$(PERL6_INSTALL) @default_backend_exe@ - $(CHMOD) 755 @default_backend_exe@ + $(CP) $(DESTDIR)@default_backend_exe@ $(PERL6_EXE) + $(CHMOD) 755 $(PERL6_EXE) @win32_libparrot_copy@ modules-install: rakudo-install @@ -79,7 +81,7 @@ test: @echo "To run the Rakudo compiler tests, use '$(MAKE) rakudo-test'" @echo "To run the Perl 6 spectests, use '$(MAKE) rakudo-spectest'" @echo "" - @echo "To run tests for individual modules, try:" + @echo "To run tests for individual modules, install and then try:" @echo " prove -e ./perl6 -r modules/<name>/t" @echo "" |