diff mbox

[U-Boot,3/3] buildman: make sure to invoke GNU Make

Message ID 1405588682-10724-4-git-send-email-yamada.m@jp.panasonic.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada July 17, 2014, 9:18 a.m. UTC 
Since the command name 'make' is not GNU Make on some platforms
such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

 tools/buildman/builder.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Simon Glass July 19, 2014, 4:40 a.m. UTC | #1 
On 17 July 2014 03:18, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote:
> Since the command name 'make' is not GNU Make on some platforms
> such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Maybe you will rename the script, but the code looks good.

Acked-by: Simon Glass <sjg@chromium.org>
Jeroen Hofstee July 20, 2014, 6:13 p.m. UTC | #2 
Hello Masahiro,

On 17-07-14 11:18, Masahiro Yamada wrote:
> Since the command name 'make' is not GNU Make on some platforms
> such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
>
>   tools/buildman/builder.py | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
> index 4a2d753..c68cc8c 100644
> --- a/tools/buildman/builder.py
> +++ b/tools/buildman/builder.py
> @@ -667,7 +667,8 @@ class Builder:
>               args: Arguments to pass to make
>               kwargs: Arguments to pass to command.RunPipe()
>           """
> -        cmd = ['make'] + list(args)
> +        gnu_make = os.path.join(self.git_dir, '../scripts/gnu_make')
> +        cmd = [gnu_make] + list(args)
>           result = command.RunPipe([cmd], capture=True, capture_stderr=True,
>                   cwd=cwd, raise_on_error=False, **kwargs)
>           return result
with a trick to let buildman call clang, this works
fine on FreeBSD.

Tested-By: Jeroen Hofstee <jeroen@myspectrum.nl>

Regards,
Jeroen
diff mbox

Patch

diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index 4a2d753..c68cc8c 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -667,7 +667,8 @@  class Builder:
             args: Arguments to pass to make
             kwargs: Arguments to pass to command.RunPipe()
         """
-        cmd = ['make'] + list(args)
+        gnu_make = os.path.join(self.git_dir, '../scripts/gnu_make')
+        cmd = [gnu_make] + list(args)
         result = command.RunPipe([cmd], capture=True, capture_stderr=True,
                 cwd=cwd, raise_on_error=False, **kwargs)
         return result