Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1349393

[tip:core/objtool] tools: Support relative directory path for 'O='

Show all headers | View raw

Commit-ID:  e17cf3a80d4ba0c4e40bf1a89deb1354c2e10e14
Gitweb:     http://git.kernel.org/tip/e17cf3a80d4ba0c4e40bf1a89deb1354c2e10e14
Author:     Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Thu, 3 Mar 2016 08:53:43 -0600
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 3 Mar 2016 16:13:00 +0100

tools: Support relative directory path for 'O='

Running "make O=foo" (with a relative directory path) fails with:

  scripts/Makefile.include:3: *** O=foo does not exist.  Stop.
  /home/jpoimboe/git/linux/Makefile:1547: recipe for target 'tools/objtool' failed

The tools Makefile gets confused by the relative path and tries to build
objtool in tools/foo.  Convert the output directory to an absolute path
before passing it to the tools Makefile.

Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-next@vger.kernel.org
Cc: linux@roeck-us.net
Cc: live-patching@vger.kernel.org
Link: http://lkml.kernel.org/r/94a078c6c998fac9f01a14f574008bf7dff40191.1457016803.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 62be03b..2c27a01 100644
--- a/Makefile
+++ b/Makefile
@@ -1509,11 +1509,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=$(O) subdir=tools -C $(src)/tools/
+	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/
 
 tools/%: FORCE
 	$(Q)mkdir -p $(objtree)/tools
-	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ $*
+	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*
 
 # Single targets
 # ---------------------------------------------------------------------------

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: Tree for Mar 3 Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-03 07:10 +0100
  Re: linux-next: Tree for Mar 3 Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-03-03 12:10 +0100
    Re: linux-next: Tree for Mar 3 Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-03-03 12:20 +0100
      Re: linux-next: Tree for Mar 3 Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-03 15:40 +0100
        [PATCH] tools: Support relative directory path for 'O=' Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-03 16:00 +0100
          [tip:core/objtool] tools: Support relative directory path for 'O=' tip-bot for Josh Poimboeuf <tipbot@zytor.com> - 2016-03-03 18:10 +0100
        [PATCH] objtool: Warn if libelf is missing Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-03 18:50 +0100
    Re: linux-next: Tree for Mar 3 Guenter Roeck <linux@roeck-us.net> - 2016-03-03 13:10 +0100

csiph-web