fix PATH for make modules-install under windows

rakudo · Apr 29, 2016 · 87c3a4a · 87c3a4a
1 parent 3379969
commit 87c3a4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -160,7 +160,7 @@
     $config{'cpsep'} = $^O eq 'MSWin32' ? ';' : ':';
     $config{'shell'} = $^O eq 'MSWin32' ? 'cmd' : 'sh';
     $config{'bat'} = $^O eq 'MSWin32' ? '.bat' : '';
-    $config{'path'} = $^O ne 'MSWin32' ? 'PATH=$(STAR_BIN_DIR):$(PATH)' : '';
+    $config{'path'} = $^O ne 'MSWin32' ? 'sh -c "PATH=$(STAR_BIN_DIR):$(PATH)' : 'cmd /c "path $(STAR_BIN_DIR);$(PATH) && ';
     my $make = $config{'make'} = $^O eq 'MSWin32' ? 'nmake' : 'make';
 
     my @prefixes = sort map substr($_, 0, 1), keys %backends;

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
@@ -56,13 +56,13 @@ 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/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)"
 
 modules-install-m: rakudo-install
 	@echo "== Installing modules for MoarVM"
-	cd modules/panda && @path@ $(DESTDIR)$(PERL6_M_INSTALL) bootstrap.pl
-	@path@ $(PERL) tools/build/module-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)
+	cd modules/panda && @path@ $(DESTDIR)$(PERL6_M_INSTALL) bootstrap.pl"
+	@path@ $(PERL) tools/build/module-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)"
 
 modules-test: @backend_modules_test@
 verbose-modules-test: @backend_modules_test@