diff options
author | Jiri Olsa <jolsa@kernel.org> | 2018-12-12 05:25:33 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-12-28 14:33:08 -0500 |
commit | ad6b474f445e587e9b56ec44241b1639bccf6738 (patch) | |
tree | 577498063bc39d5fbf205d8b97b4557f24b1c490 | |
parent | f1770e3ca4ec10ce43825de2f855a1831c711195 (diff) |
tools thermal tmon: Allow overriding CFLAGS assignments
So that the user can provide, e.g. distro package alternative values.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Herton Krzesinski <herton@redhat.com>
Cc: Markus Mayer <mmayer@broadcom.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Link: http://lkml.kernel.org/r/20181212102537.25902-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/thermal/tmon/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile index 735a510230c3..89a2444c1df2 100644 --- a/tools/thermal/tmon/Makefile +++ b/tools/thermal/tmon/Makefile | |||
@@ -6,13 +6,13 @@ VERSION = 1.0 | |||
6 | 6 | ||
7 | BINDIR=usr/bin | 7 | BINDIR=usr/bin |
8 | WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int | 8 | WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int |
9 | CFLAGS+= -O1 ${WARNFLAGS} | 9 | override CFLAGS+= -O1 ${WARNFLAGS} |
10 | # Add "-fstack-protector" only if toolchain supports it. | 10 | # Add "-fstack-protector" only if toolchain supports it. |
11 | CFLAGS+= $(call cc-option,-fstack-protector) | 11 | override CFLAGS+= $(call cc-option,-fstack-protector-strong) |
12 | CC?= $(CROSS_COMPILE)gcc | 12 | CC?= $(CROSS_COMPILE)gcc |
13 | PKG_CONFIG?= pkg-config | 13 | PKG_CONFIG?= pkg-config |
14 | 14 | ||
15 | CFLAGS+=-D VERSION=\"$(VERSION)\" | 15 | override CFLAGS+=-D VERSION=\"$(VERSION)\" |
16 | LDFLAGS+= | 16 | LDFLAGS+= |
17 | TARGET=tmon | 17 | TARGET=tmon |
18 | 18 | ||
@@ -29,7 +29,7 @@ TMON_LIBS += $(shell $(PKG_CONFIG) --libs $(STATIC) panelw ncursesw 2> /dev/null | |||
29 | $(PKG_CONFIG) --libs $(STATIC) panel ncurses 2> /dev/null || \ | 29 | $(PKG_CONFIG) --libs $(STATIC) panel ncurses 2> /dev/null || \ |
30 | echo -lpanel -lncurses) | 30 | echo -lpanel -lncurses) |
31 | 31 | ||
32 | CFLAGS += $(shell $(PKG_CONFIG) --cflags $(STATIC) panelw ncursesw 2> /dev/null || \ | 32 | override CFLAGS += $(shell $(PKG_CONFIG) --cflags $(STATIC) panelw ncursesw 2> /dev/null || \ |
33 | $(PKG_CONFIG) --cflags $(STATIC) panel ncurses 2> /dev/null) | 33 | $(PKG_CONFIG) --cflags $(STATIC) panel ncurses 2> /dev/null) |
34 | 34 | ||
35 | OBJS = tmon.o tui.o sysfs.o pid.o | 35 | OBJS = tmon.o tui.o sysfs.o pid.o |