From: Roger Pau Monne <roger.pau@citrix.com>
Date: Fri, 29 Jun 2018 08:18:04 +0000 (+0200)
Subject: osstest: set the make command to use for xen-build
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=05eaa3d0d7e914765a9543bc36552f3cb39841bf;p=osstest.git

osstest: set the make command to use for xen-build

The default make on FreeBSD is the BSD make, and Xen requires the GNU
make in order to build. Set the make command based on the OS for the
Xen build.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes since v1:
 - Use gmake for all BSDs.
---

diff --git a/ts-xen-build b/ts-xen-build
index 57913d4..48bf062 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -28,6 +28,7 @@ tsreadconfig();
 selectbuildhost(\@ARGV);
 
 our $dokconfig = 1;
+our $make = $ho->{OS} =~ m/bsd/ ? "gmake" : "make";
 
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_ = shift @ARGV;
@@ -156,24 +157,24 @@ END
 
     buildcmd_stamped_logged(600, 'xen', 'kconfig', '',<<END,'') if $dokconfig;
             if test -f xen/Kconfig; then
-                $make_prefix make -C xen olddefconfig
+                $make_prefix $make -C xen olddefconfig
             fi
 END
 
     if (!@make_args) {
 	buildcmd_stamped_logged(9000, 'xen', 'build', '',<<END,'');
-            $make_prefix make $makeflags build
+            $make_prefix $make $makeflags build
 END
     }
 
     buildcmd_stamped_logged(9000, 'xen', 'all', '',<<END,'');
-            $make_prefix make $makeflags @make_args
+            $make_prefix $make $makeflags @make_args
 END
 
     if ($enable_xsm) {
 	my $xen_version = target_cmd_output($ho, <<END, 30);
 	    cd $builddir/xen
-	    $make_prefix make xenversion
+	    $make_prefix $make xenversion
 END
 	store_runvar("flaskpolicy", "xenpolicy-" . $xen_version);
     }
@@ -181,7 +182,7 @@ END
     if ($enable_livepatch) {
 	substep_eval('/dist-test', sub {
 	    buildcmd_stamped_logged(600, 'xen', 'xenlpt', '',<<END,'');
-            $make_prefix make $makeflags dist-tests
+            $make_prefix $make $makeflags dist-tests
 END
 	});
     }