Re: [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile

From: Mark Asselstine
Date: Mon Jan 05 2015 - 14:10:28 EST


On January 4, 2015 18:52:43 Thomas D wrote:
> 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 ...").
>
> 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@xxxxxxxxx>
> Cc: Mark Asselstine <mark.asselstine@xxxxxxxxxxxxx>

Looks fine. I am wondering if we should take this opportunity to respect "O="
as the kernel does. ie. default to CURDIR but using whatever is passed in via
O= on the cmdline.

Mark

> Cc: Len Brown <len.brown@xxxxxxxxx>
> ---
> tools/power/x86/turbostat/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/power/x86/turbostat/Makefile
> b/tools/power/x86/turbostat/Makefile index d1b3a36..6dd4cad 100644
> --- a/tools/power/x86/turbostat/Makefile
> +++ b/tools/power/x86/turbostat/Makefile
> @@ -1,5 +1,5 @@
> CC = $(CROSS_COMPILE)gcc
> -BUILD_OUTPUT := $(PWD)
> +BUILD_OUTPUT := $(CURDIR)
> PREFIX := /usr
> DESTDIR :=
>
> --
> 2.2.1

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