qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Blue Swirl <blauwirbel@gmail.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH] Makefile: Forbid out-of-tree build from a source tree that has been built in
Date: Sat, 27 Oct 2012 16:54:07 +0000	[thread overview]
Message-ID: <CAAu8pHuN7tUh6_1HRCEctrcasPZSCcVZsofpPQTe2NPhSDPmFw@mail.gmail.com> (raw)
In-Reply-To: <1350654863-26048-1-git-send-email-peter.maydell@linaro.org>

Thanks, applied.

On Fri, Oct 19, 2012 at 1:54 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> If we try to do an out-of-tree build but the source tree we're building from
> has been used in the past for an in-tree build then things will go
> confusingly wrong. Specifically, some parts of the build process will pull
> in generated files from the old in-tree build (because SRC_PATH is on
> the vpath). Diagnose this situation so we can produce a useful error
> message and tell the user how to fix it (run distclean in the source tree).
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> I got bitten by this again the other day so I figured it was worth
> adding a molly-guard. The check is not perfect (it won't notice if
> you did a distclean but didn't delete the *-softmmu &c directories,
> for instance) but it should catch most cases of this user error.
>
>  Makefile |   11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index a9c22bf..5094a08 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -8,6 +8,17 @@ ifneq ($(wildcard config-host.mak),)
>  # Put the all: rule here so that config-host.mak can contain dependencies.
>  all:
>  include config-host.mak
> +
> +# Check that we're not trying to do an out-of-tree build from
> +# a tree that's been used for an in-tree build.
> +ifneq ($(realpath $(SRC_PATH)),$(realpath .))
> +ifneq ($(wildcard $(SRC_PATH)/config-host.mak),)
> +$(error This is an out of tree build but your source tree ($(SRC_PATH)) \
> +seems to have been used for an in-tree build. You can fix this by running \
> +"make distclean && rm -rf *-linux-user *-softmmu" in your source tree)
> +endif
> +endif
> +
>  include $(SRC_PATH)/rules.mak
>  config-host.mak: $(SRC_PATH)/configure
>         @echo $@ is out-of-date, running configure
> --
> 1.7.9.5
>
>

      parent reply	other threads:[~2012-10-27 16:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-19 13:54 [Qemu-devel] [PATCH] Makefile: Forbid out-of-tree build from a source tree that has been built in Peter Maydell
2012-10-19 17:57 ` Blue Swirl
2012-10-27 16:54 ` Blue Swirl [this message]

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=CAAu8pHuN7tUh6_1HRCEctrcasPZSCcVZsofpPQTe2NPhSDPmFw@mail.gmail.com \
    --to=blauwirbel@gmail.com \
    --cc=patches@linaro.org \
    --cc=peter.maydell@linaro.org \
    --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).