qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku


From: Thomas Huth
Subject: Re: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku
Date: Sun, 4 Jul 2021 18:19:36 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]