From: Richard Zak <richard.j.zak@gmail.com>
To: "QEMU Developers" <qemu-devel@nongnu.org>,
"Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku
Date: Sun, 4 Jul 2021 10:28:56 -0400 [thread overview]
Message-ID: <CAOakUfM6HED-01ntpHTGXuQVg8XX4QnwacE=+eho_NOdQsKfvw@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
Signed-off-by: Richard Zak <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
# Usage: $(call quiet-command,command and args,"NAME","args to print")
# This will run "command and args", and either:
--
2.25.1
--
Regards,
Richard J. Zak
Professional Genius
PGP Key: https://keybase.io/rjzak/key.asc
[-- Attachment #2: Type: text/html, Size: 1278 bytes --]
next reply other threads:[~2021-07-04 14:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-04 14:28 Richard Zak [this message]
2021-07-04 16:19 ` [PATCH 2/2 v2] Fix SHELL variable in Makefile for Haiku Thomas Huth
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='CAOakUfM6HED-01ntpHTGXuQVg8XX4QnwacE=+eho_NOdQsKfvw@mail.gmail.com' \
--to=richard.j.zak@gmail.com \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.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).