diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-21 13:33:06 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-21 13:33:06 +0100 |
| commit | 0db699f747cc24835af77a34852882a33b3e1fc6 (patch) | |
| tree | 3e02733a7e5987ab5c771ca98c4180482d0c449e /tools/power/cpupower/bench/Makefile | |
| parent | Linux 4.20-rc3 (diff) | |
| parent | tools cpupower: Override CFLAGS assignments (diff) | |
| download | linux-0db699f747cc24835af77a34852882a33b3e1fc6.tar.xz linux-0db699f747cc24835af77a34852882a33b3e1fc6.zip | |
Merge tag 'linux-cpupower-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Pull cpupower utility updates for 4.20-rc4 from Shuah Khan:
"This cpupower update for Linux 4.20-rc4 consists of compile fixes to allow
use of outside build flags and override of CFLAGS from Jiri Olsa, and fix
to compilation with STATIC=true from Konstantin Khlebnikov."
* tag 'linux-cpupower-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
tools cpupower: Override CFLAGS assignments
tools cpupower debug: Allow to use outside build flags
tools/power/cpupower: fix compilation with STATIC=true
Diffstat (limited to 'tools/power/cpupower/bench/Makefile')
| -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 d79ab161cc75..f68b4bc55273 100644 --- a/tools/power/cpupower/bench/Makefile +++ b/tools/power/cpupower/bench/Makefile @@ -9,7 +9,7 @@ endif ifeq ($(strip $(STATIC)),true) LIBS = -L../ -L$(OUTPUT) -lm OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o \ - $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/sysfs.o + $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/cpupower.o else LIBS = -L../ -L$(OUTPUT) -lm -lcpupower OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o |