|
From: | Richard Zak |
Subject: | Re: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku |
Date: | Sun, 4 Jul 2021 12:36:48 -0400 |
On 04/07/2021 16.28, Richard Zak wrote:
> Signed-off-by: Richard Zak <richard.j.zak@gmail.com
> <mailto:richard.j.zak@gmail.com>>
> ---
> Makefile | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 30f19d33bb..37124410da 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -14,7 +14,13 @@ SRC_PATH=.
> # we have explicit rules for everything
> MAKEFLAGS += -rR
>
> -SHELL = /usr/bin/env bash -o pipefail
> +# Detect Haiku by checking BeOS variable for host CPU type
> +ifneq ($(BE_HOST_CPU),)
> + # Haiku doesn't have the /usr directory
> + SHELL = /bin/env bash -o pipefail
> +else
> + SHELL = /usr/bin/env bash -o pipefail
> +endif
Why not simply:
diff --git a/Makefile b/Makefile
--- 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:
?
Thomas
[Prev in Thread] | Current Thread | [Next in Thread] |