All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Norris <computersforpeace@gmail.com>
To: Michal Marek <mmarek@suse.cz>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
	Brian Norris <computersforpeace@gmail.com>,
	David Howells <dhowells@redhat.com>, Borislav Petkov <bp@suse.de>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH] tools: unbreak 'make tools/*'
Date: Wed, 28 Jan 2015 20:47:36 -0800	[thread overview]
Message-ID: <1422506856-28631-1-git-send-email-computersforpeace@gmail.com> (raw)

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


WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <computersforpeace@gmail.com>
To: Michal Marek <mmarek@suse.cz>
Cc: <linux-kernel@vger.kernel.org>,
	linux-kbuild@vger.kernel.org,
	Brian Norris <computersforpeace@gmail.com>,
	David Howells <dhowells@redhat.com>, Borislav Petkov <bp@suse.de>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH] tools: unbreak 'make tools/*'
Date: Wed, 28 Jan 2015 20:47:36 -0800	[thread overview]
Message-ID: <1422506856-28631-1-git-send-email-computersforpeace@gmail.com> (raw)

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


             reply	other threads:[~2015-01-29  4:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-29  4:47 Brian Norris [this message]
2015-01-29  4:47 ` [PATCH] tools: unbreak 'make tools/*' Brian Norris
2015-02-02 23:43 ` Brian Norris
2015-02-03  0:07   ` Arnaldo Carvalho de Melo
2015-03-19 13:39 ` Arnaldo Carvalho de Melo
2015-03-19 14:20   ` Jiri Olsa
2015-03-19 16:11     ` Brian Norris

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=1422506856-28631-1-git-send-email-computersforpeace@gmail.com \
    --to=computersforpeace@gmail.com \
    --cc=acme@kernel.org \
    --cc=bp@suse.de \
    --cc=dhowells@redhat.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    --cc=sam@ravnborg.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.