Commit f82263c6 authored by Thomas D's avatar Thomas D Committed by Len Brown

tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile

Since commit ee0778a3
("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 does not 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: ee0778a3 ("tools/power: turbostat: make Makefile a bit more capable")
Signed-off-by: default avatarThomas D. <whissi@whissi.de>
Cc: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a21d38c8
CC = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc
BUILD_OUTPUT := $(PWD) BUILD_OUTPUT := $(CURDIR)
PREFIX := /usr PREFIX := /usr
DESTDIR := DESTDIR :=
ifeq ("$(origin O)", "command line")
BUILD_OUTPUT := $(O)
endif
turbostat : turbostat.c turbostat : turbostat.c
CFLAGS += -Wall CFLAGS += -Wall
CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"' CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment