From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753971AbbAEUif (ORCPT ); Mon, 5 Jan 2015 15:38:35 -0500 Received: from borg.tf-network.de ([62.75.218.204]:52854 "EHLO borg.tf-network.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbbAEUie (ORCPT ); Mon, 5 Jan 2015 15:38:34 -0500 From: Thomas D To: linux-kernel@vger.kernel.org Cc: Thomas D , Mark Asselstine , Len Brown Subject: Re: [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile Date: Mon, 5 Jan 2015 21:37:23 +0100 Message-Id: <1420490243-15375-1-git-send-email-whissi@whissi.de> X-Mailer: git-send-email 2.2.1 In-Reply-To: <2779550.jOF2haXjUH@yow-masselst-d1> References: <2779550.jOF2haXjUH@yow-masselst-d1> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefil Since commit ee0778a30153 ("tools/power: turbostat: make Makefile a bit more capable") turbostat’s Makefile is using [...] BUILD_OUTPUT := $(PWD) [...] which obviously causes trouble when building "turbostat" with make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat because GNU make doesn’t update nor guarantee that $PWD is set. This patch changes the Makefile to use $CURDIR instead, which GNU make guarantees to set and update (i.e. when using "make –C ...") and also adds support for the O= option (see "make help" in your root of your kernel source tree for more details). Link: https://bugs.gentoo.org/show_bug.cgi?id=533918 Fixes: ee0778a30153 ("tools/power: turbostat: make Makefile a bit more capable") Signed-off-by: Thomas D. Cc: Mark Asselstine Cc: Len Brown --- I followed Mark's suggestion and also added support for the O= option. I took the logic from tools/power/cpupower/Makefile. ...i also hope this reply will work and doesn't break the tread ;) tools/power/x86/turbostat/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index d1b3a36..4039854 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -1,8 +1,12 @@ CC = $(CROSS_COMPILE)gcc -BUILD_OUTPUT := $(PWD) +BUILD_OUTPUT := $(CURDIR) PREFIX := /usr DESTDIR := +ifeq ("$(origin O)", "command line") + BUILD_OUTPUT := $(O) +endif + turbostat : turbostat.c CFLAGS += -Wall CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"' -- 2.2.1