diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-01-23 21:12:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-01-23 21:12:06 +0100 |
| commit | d3b93fe159b8d3a48565c4ecd602e3499764d549 (patch) | |
| tree | ceca31e29acc960d6471fd52898295d8f909d6ac | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
| parent | 0086ffec768bec6f5d61fc7e406af640eb912a24 (diff) | |
| download | linux-d3b93fe159b8d3a48565c4ecd602e3499764d549.tar.gz linux-d3b93fe159b8d3a48565c4ecd602e3499764d549.tar.bz2 linux-d3b93fe159b8d3a48565c4ecd602e3499764d549.zip | |
Merge tag 'linux-cpupower-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Merge cpupower utility update for 6.8-rc2 from Shuah Khan:
"This cpupower fixes update for Linux 6.8-rc2 consists of one single fix
to an issue where CFLAGS is passed as a make argument for cpupower, but
bench makefile does not inherit and append to them."
This fixes the problem so the user specified CFLAGS are honored.
* tag 'linux-cpupower-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
tools cpupower bench: Override CFLAGS assignments
| -rw-r--r-- | tools/power/cpupower/bench/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/cpupower/bench/Makefile b/tools/power/cpupower/bench/Makefile index d9d9923af85c..a4b902f9e1c4 100644 --- a/tools/power/cpupower/bench/Makefile +++ b/tools/power/cpupower/bench/Makefile @@ -15,7 +15,7 @@ LIBS = -L../ -L$(OUTPUT) -lm -lcpupower OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o endif -CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\" +override CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\" $(OUTPUT)%.o : %.c $(ECHO) " CC " $@ |