Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Some fixes to get tri-Star build/test working.
  • Loading branch information
jnthn committed Mar 16, 2014
1 parent 45ea838 commit 3488b6c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Configure.pl
Expand Up @@ -108,11 +108,11 @@
}

$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";
Expand Down
8 changes: 5 additions & 3 deletions tools/build/Makefile.in
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 ""

Expand Down

0 comments on commit 3488b6c

Please sign in to comment.