From: Roman Bolshakov <r.bolshakov@yadro.com>
To: <qemu-devel@nongnu.org>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Subject: [PATCH 3/4] configure: Prefer gmake on darwin
Date: Sun, 23 Aug 2020 00:21:28 +0300 [thread overview]
Message-ID: <20200822212129.97758-4-r.bolshakov@yadro.com> (raw)
In-Reply-To: <20200822212129.97758-1-r.bolshakov@yadro.com>
New meson/make build requires GNU make 3.82+ but macOS ships 3.81 even
on Big Sur while homebrew provides GNU make 4.3 as 'gmake' in $PATH.
With the change, 'make' switches over to gmake implicitly.
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
---
configure | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/configure b/configure
index 9e0d505067..90b02b7271 100755
--- a/configure
+++ b/configure
@@ -903,6 +903,7 @@ Darwin)
darwin="yes"
hax="yes"
hvf="yes"
+ make="${MAKE-gmake}"
LDFLAGS_SHARED="-bundle -undefined dynamic_lookup"
if [ "$cpu" = "x86_64" ] ; then
QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS"
@@ -916,6 +917,27 @@ Darwin)
# won't work when we're compiling with gcc as a C compiler.
QEMU_CFLAGS="-DOS_OBJECT_USE_OBJC=0 $QEMU_CFLAGS"
HOST_VARIANT_DIR="darwin"
+ cat > GNUmakefile <<'EOF'
+# This file is auto-generated by configure to implicitly switch from a 'make'
+# invocation to 'gmake'
+
+OLD_MAKE := $(MAKE)
+
+include config-host.mak
+
+ifeq ($(MAKECMDGOALS),)
+recurse: all
+endif
+
+.NOTPARALLEL: %
+%: force
+ @echo 'Switch from $(OLD_MAKE) to $(MAKE)'
+ @$(MAKE) -f Makefile $(MAKECMDGOALS)
+force: ;
+.PHONY: force
+GNUmakefile: ;
+
+EOF
;;
SunOS)
solaris="yes"
--
2.28.0
next prev parent reply other threads:[~2020-08-22 21:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-22 21:21 [PATCH 0/4] Compatibility make fixes for meson Roman Bolshakov
2020-08-22 21:21 ` [PATCH 1/4] configure: Use discovered make for in-source build Roman Bolshakov
2020-08-24 14:31 ` Daniel P. Berrangé
2020-08-24 14:37 ` Eric Blake
2020-08-24 22:07 ` Roman Bolshakov
2020-08-25 10:16 ` Roman Bolshakov
2020-08-25 14:06 ` Eric Blake
2020-08-24 14:43 ` Eric Blake
2020-08-22 21:21 ` [PATCH 2/4] Makefile: Require GNU make 3.82+ Roman Bolshakov
2020-08-24 14:32 ` Daniel P. Berrangé
2020-08-22 21:21 ` Roman Bolshakov [this message]
2020-08-24 14:48 ` [PATCH 3/4] configure: Prefer gmake on darwin Daniel P. Berrangé
2020-08-24 14:49 ` Eric Blake
2020-08-24 14:51 ` Daniel P. Berrangé
2020-08-24 14:56 ` Eric Blake
2020-08-24 15:57 ` Peter Maydell
2020-08-25 9:25 ` Roman Bolshakov
2020-08-22 21:21 ` [PATCH 4/4] configure: Test if $make actually exists Roman Bolshakov
2020-08-24 14:49 ` Daniel P. Berrangé
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=20200822212129.97758-4-r.bolshakov@yadro.com \
--to=r.bolshakov@yadro.com \
--cc=qemu-devel@nongnu.org \
/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).