From: Roman Bolshakov <r.bolshakov@yadro.com>
To: <qemu-devel@nongnu.org>
Cc: "Roman Bolshakov" <r.bolshakov@yadro.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v2 1/4] configure: Use discovered make for in-source build
Date: Tue, 25 Aug 2020 23:27:52 +0300 [thread overview]
Message-ID: <20200825202755.50626-2-r.bolshakov@yadro.com> (raw)
In-Reply-To: <20200825202755.50626-1-r.bolshakov@yadro.com>
A recursive make is invoked if in-source build is used but $(MAKE) is
the same as the one used in the original make invocation.
Some platforms have preference to use gmake, or a make passed as an
option to "configure". Honor the choice.
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
---
configure | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure b/configure
index b1e11397a8..07732bf011 100755
--- a/configure
+++ b/configure
@@ -38,6 +38,11 @@ then
# This file is auto-generated by configure to support in-source tree
# 'make' command invocation
+ifeq ($(wildcard build/config-host.mak),)
+$(error Incomplete configuration. Please run `configure`)
+endif
+include build/config-host.mak
+
ifeq ($(MAKECMDGOALS),)
recurse: all
endif
@@ -54,6 +59,7 @@ endif
force: ;
.PHONY: force
GNUmakefile: ;
+build/config-host.mak: ;
EOF
cd build
--
2.28.0
next prev parent reply other threads:[~2020-08-25 20:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 20:27 [PATCH v2 0/4] Compatibility make fixes for meson Roman Bolshakov
2020-08-25 20:27 ` Roman Bolshakov [this message]
2020-08-25 20:27 ` [PATCH v2 2/4] Makefile: Require GNU make 3.82+ Roman Bolshakov
2020-10-12 9:47 ` Thomas Huth
2020-12-13 17:21 ` Laurent Vivier
2020-12-13 19:04 ` Peter Maydell
2020-12-13 22:56 ` Laurent Vivier
2020-12-14 13:46 ` Roman Bolshakov
2020-08-25 20:27 ` [PATCH v2 3/4] configure: Prefer gmake on darwin Roman Bolshakov
2020-08-25 20:27 ` [PATCH v2 4/4] configure: Test if $make actually exists Roman Bolshakov
2020-10-12 9:49 ` Thomas Huth
2020-12-13 17:22 ` Laurent Vivier
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=20200825202755.50626-2-r.bolshakov@yadro.com \
--to=r.bolshakov@yadro.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.