diff options
| author | Moritz Lenz <moritz@faui2k3.org> | 2013-11-07 04:20:16 +0100 |
|---|---|---|
| committer | Moritz Lenz <moritz@faui2k3.org> | 2013-11-07 04:20:16 +0100 |
| commit | cc5c2b11fc2d90b56a46d336fcfb57b23faef396 (patch) | |
| tree | 883cb2cb0d67c1d50d80763df816264c996c6119 /tools | |
| parent | 8fe0f38345fe04795ac46cd2af401c686c11a448 (diff) | |
start to adapt build to multiple backends
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/lib/NQP/Configure.pm | 4 |
2 files changed, 5 insertions, 1 deletions
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'); } |