Makefile: Remove /usr/bin/env wrapper from the SHELL variable

[PATCH] Makefile: Remove /usr/bin/env wrapper from the SHELL variable

Posted by Thomas Huth 4 years, 5 months ago

The wrapper should not be needed here (it's not the shebang line of
a shell script), and it is causing trouble on Haiku where "env"
resides in a different directory.

Reported-by: Richard Zak <richard.j.zak@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 30f19d33bb..6c36330eef 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ SRC_PATH=.
 # we have explicit rules for everything
 MAKEFLAGS += -rR
 
-SHELL = /usr/bin/env bash -o pipefail
+SHELL = bash -o pipefail
 
 # Usage: $(call quiet-command,command and args,"NAME","args to print")
 # This will run "command and args", and either:
-- 
2.27.0

Re: [PATCH] Makefile: Remove /usr/bin/env wrapper from the SHELL variable

Posted by Daniel P. Berrangé 4 years, 5 months ago

On Mon, Jul 05, 2021 at 10:25:42AM +0200, Thomas Huth wrote:
> The wrapper should not be needed here (it's not the shebang line of
> a shell script), and it is causing trouble on Haiku where "env"
> resides in a different directory.
> 
> Reported-by: Richard Zak <richard.j.zak@gmail.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] Makefile: Remove /usr/bin/env wrapper from the SHELL variable

Posted by Philippe Mathieu-Daudé 4 years, 5 months ago

On 7/5/21 10:25 AM, Thomas Huth wrote:
> The wrapper should not be needed here (it's not the shebang line of
> a shell script), and it is causing trouble on Haiku where "env"
> resides in a different directory.
> 
> Reported-by: Richard Zak <richard.j.zak@gmail.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] Makefile: Remove /usr/bin/env wrapper from the SHELL variable

Posted by Paolo Bonzini 4 years, 5 months ago

On 05/07/21 10:25, Thomas Huth wrote:
> The wrapper should not be needed here (it's not the shebang line of
> a shell script), and it is causing trouble on Haiku where "env"
> resides in a different directory.
> 
> Reported-by: Richard Zak <richard.j.zak@gmail.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 30f19d33bb..6c36330eef 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,7 +14,7 @@ SRC_PATH=.
>   # we have explicit rules for everything
>   MAKEFLAGS += -rR
>   
> -SHELL = /usr/bin/env bash -o pipefail
> +SHELL = bash -o pipefail
>   
>   # Usage: $(call quiet-command,command and args,"NAME","args to print")
>   # This will run "command and args", and either:
> 

Queued, thanks.

Paolo