From: Thomas D <whissi@whissi.de>
To: linux-kernel@vger.kernel.org
Cc: Thomas D <whissi@whissi.de>,
Mark Asselstine <mark.asselstine@windriver.com>,
Len Brown <len.brown@intel.com>
Subject: Re: [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile
Date: Mon, 5 Jan 2015 21:37:23 +0100 [thread overview]
Message-ID: <1420490243-15375-1-git-send-email-whissi@whissi.de> (raw)
In-Reply-To: <2779550.jOF2haXjUH@yow-masselst-d1>
[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. <whissi@whissi.de>
Cc: Mark Asselstine <mark.asselstine@windriver.com>
Cc: Len Brown <len.brown@intel.com>
---
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
next prev parent reply other threads:[~2015-01-05 20:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-04 17:52 Thomas D
2015-01-05 19:11 ` Mark Asselstine
2015-01-05 20:37 ` Thomas D [this message]
2015-01-05 20:54 ` Mark Asselstine
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=1420490243-15375-1-git-send-email-whissi@whissi.de \
--to=whissi@whissi.de \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.asselstine@windriver.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®