Re: [PATCH] tools: unbreak 'make tools/*'

Arnaldo Carvalho de Melo
2015-02-03T00:07:32Z

Em Mon, Feb 02, 2015 at 03:43:09PM -0800, Brian Norris escreveu:
> Ping?

Thanks for submitting the patch, its just that I am busy at the moment,
preparing for travel, I will process this patch eventually.

- Arnaldo

> On Wed, Jan 28, 2015 at 08:47:36PM -0800, Brian Norris wrote:
> > The following targets should be supported from the top-level source
> > directory, but were broken by commit 7e1c04779efd ("kbuild: Use relative
> > path for $(objtree)"):
> >
> > $ make tools/
> > $ make tools/perf
> > $ make O=$(BUILDDIR) tools/perf
> >
> > The tools/ and tools/% targets are passing the top-level build directory
> > as an O= argument, so we need a full path, not a relative one, as the
> > $(O) variable will be reinterpreted by the sub-makefile.
> >
> > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > Cc: Michal Marek <mmarek@suse.cz>
> > ---
> > Makefile | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 95a0e827ecd3..59033c8bf93a 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1496,11 +1496,11 @@ image_name:
> > # Clear a bunch of variables before executing the submake
> > tools/: FORCE
> > $(Q)mkdir -p $(objtree)/tools
> > - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/
> > + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(CURDIR) subdir=tools -C $(src)/tools/
> >
> > tools/%: FORCE
> > $(Q)mkdir -p $(objtree)/tools
> > - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $*
> > + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(CURDIR) subdir=tools -C $(src)/tools/ $*
> >
> > # Single targets
> > # ---------------------------------------------------------------------------
> > --
> > 2.3.0.rc1
> >