[Buildroot] [PATCH v9 01/11] core: split variables definition related to in/out-of-tree build from O itself
Arnout Vandecappelle
arnout at mind.be
Sun Jun 26 22:27:50 UTC 2016
On 22-04-16 22:50, Samuel Martin wrote:
> This change uncorrolates the CONFIG_DIR and NEED_WRAPPER definition from
> the presence of the O variable in the command line.
>
> Now, the condition used to set these variables is the value of O itself.
>
> This change is a preparatory work since the O definition will need to
> be moved around when we will make Buildroot run with absolute canonical
> paths for both its root directory and the output location.
> This will be addressed in a follow-up patch.
>
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
(finally :-) but don't count on me being able to finish the series tonight)
Regards,
Arnout
>
> ---
> changes v8->v9:
> - none
>
> changes v7->v8:
> - new patch
> ---
> Makefile | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 0e4beb2..3d86c9b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -110,10 +110,11 @@ comma := ,
> empty :=
> space := $(empty) $(empty)
>
> +# Set O variable if not already done on the command line;
> +# or avoid confusing packages that can use the O=<dir> syntax for out-of-tree
> +# build by preventing it from being forwarded to sub-make calls.
> ifneq ("$(origin O)", "command line")
> O := output
> -CONFIG_DIR := $(TOPDIR)
> -NEED_WRAPPER =
> else
> # other packages might also support Linux-style out of tree builds
> # with the O=<dir> syntax (E.G. BusyBox does). As make automatically
> @@ -126,9 +127,16 @@ MAKEOVERRIDES =
> # Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+)
> # To really make O go away, we have to override it.
> override O := $(O)
> -CONFIG_DIR := $(O)
> # we need to pass O= everywhere we call back into the toplevel makefile
> EXTRAMAKEARGS = O=$(O)
> +endif
> +
> +# Set variables related to in-tree or out-of-tree build.
> +ifeq ($(O),output)
> +CONFIG_DIR := $(TOPDIR)
> +NEED_WRAPPER =
> +else
> +CONFIG_DIR := $(O)
> NEED_WRAPPER = y
> endif
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
More information about the buildroot
mailing list