From cc5c2b11fc2d90b56a46d336fcfb57b23faef396 Mon Sep 17 00:00:00 2001 From: Moritz Lenz Date: Thu, 7 Nov 2013 04:20:16 +0100 Subject: start to adapt build to multiple backends --- tools/build/Makefile.in | 2 +- tools/lib/NQP/Configure.pm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 42aa229..c27cf49 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -64,7 +64,7 @@ all: rakudo rakudo: $(RAKUDO_DIR)/$(PERL6_EXE) $(RAKUDO_DIR)/$(PERL6_EXE): @echo "== Configuring and building Rakudo" - cd $(RAKUDO_DIR) && $(PERL) Configure.pl --with-nqp=$(NQP_EXE) && $(MAKE) + cd $(RAKUDO_DIR) && $(PERL) Configure.pl --prefix=$(PREFIX_DIR) && $(MAKE) rakudo-test: rakudo cd $(RAKUDO_DIR) && $(MAKE) test rakudo-spectest: rakudo diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm index f12e3b3..641d2c6 100644 --- a/tools/lib/NQP/Configure.pm +++ b/tools/lib/NQP/Configure.pm @@ -228,6 +228,10 @@ sub git_checkout { } else { chdir($dir); + unless (-e '.git') { + chdir $pwd; + return; + } system_or_die('git', 'fetch'); } -- cgit v1.1