linux-kernel - [PATCH] tools: unbreak 'make tools/*'

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 28 Jan 2015 20:47:36 -0800
From:	Brian Norris <computersforpeace@...il.com>
To:	Michal Marek <mmarek@...e.cz>
Cc:	<linux-kernel@...r.kernel.org>, linux-kbuild@...r.kernel.org,
	Brian Norris <computersforpeace@...il.com>,
	David Howells <dhowells@...hat.com>,
	Borislav Petkov <bp@...e.de>,
	Arnaldo Carvalho de Melo <acme@...nel.org>,
	Sam Ravnborg <sam@...nborg.org>
Subject: [PATCH] tools: unbreak 'make tools/*'

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@...il.com>
Cc: Michal Marek <mmarek@...e.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/