From: Thomas Huth <thuth@redhat.com>
To: "Richard Zak" <richard.j.zak@gmail.com>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Eric Blake" <eblake@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: Re: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku
Date: Sun, 4 Jul 2021 18:19:36 +0200 [thread overview]
Message-ID: <a48db2b4-fda6-1de9-1eb5-e4388a693bf3@redhat.com> (raw)
In-Reply-To: <CAOakUfM6HED-01ntpHTGXuQVg8XX4QnwacE=+eho_NOdQsKfvw@mail.gmail.com>
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
next prev parent reply other threads:[~2021-07-04 16:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-04 14:28 [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku Richard Zak
2021-07-04 16:19 ` Thomas Huth [this message]
2021-07-04 16:36 ` Richard Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a48db2b4-fda6-1de9-1eb5-e4388a693bf3@redhat.com \
--to=thuth@redhat.com \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.j.zak@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).