From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: herton@redhat.com, tglx@linutronix.de, mmayer@broadcom.com,
jolsa@kernel.org, computersforpeace@gmail.com,
linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org,
hpa@zytor.com, rui.zhang@intel.com
Subject: [tip:perf/urgent] tools thermal tmon: Allow overriding CFLAGS assignments
Date: Thu, 3 Jan 2019 05:20:41 -0800 [thread overview]
Message-ID: <tip-ad6b474f445e587e9b56ec44241b1639bccf6738@git.kernel.org> (raw)
In-Reply-To: <20181212102537.25902-3-jolsa@kernel.org>
Commit-ID: ad6b474f445e587e9b56ec44241b1639bccf6738
Gitweb: https://git.kernel.org/tip/ad6b474f445e587e9b56ec44241b1639bccf6738
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 12 Dec 2018 11:25:33 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 28 Dec 2018 16:33:08 -0300
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>
---
tools/thermal/tmon/Makefile | 8 ++++----
1 file 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
BINDIR=usr/bin
WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
-CFLAGS+= -O1 ${WARNFLAGS}
+override CFLAGS+= -O1 ${WARNFLAGS}
# Add "-fstack-protector" only if toolchain supports it.
-CFLAGS+= $(call cc-option,-fstack-protector)
+override CFLAGS+= $(call cc-option,-fstack-protector-strong)
CC?= $(CROSS_COMPILE)gcc
PKG_CONFIG?= pkg-config
-CFLAGS+=-D VERSION=\"$(VERSION)\"
+override CFLAGS+=-D VERSION=\"$(VERSION)\"
LDFLAGS+=
TARGET=tmon
@@ -29,7 +29,7 @@ TMON_LIBS += $(shell $(PKG_CONFIG) --libs $(STATIC) panelw ncursesw 2> /dev/null
$(PKG_CONFIG) --libs $(STATIC) panel ncurses 2> /dev/null || \
echo -lpanel -lncurses)
-CFLAGS += $(shell $(PKG_CONFIG) --cflags $(STATIC) panelw ncursesw 2> /dev/null || \
+override CFLAGS += $(shell $(PKG_CONFIG) --cflags $(STATIC) panelw ncursesw 2> /dev/null || \
$(PKG_CONFIG) --cflags $(STATIC) panel ncurses 2> /dev/null)
OBJS = tmon.o tui.o sysfs.o pid.o
next prev parent reply other threads:[~2019-01-03 13:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 10:25 [PATCHv2 0/6] tools: Various build flags fixes Jiri Olsa
2018-12-12 10:25 ` [PATCH 1/6] tools power x86_energy_perf_policy: Override CFLAGS assignments and add LDFLAGS to build command Jiri Olsa
2019-01-03 13:20 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2018-12-12 10:25 ` [PATCH 2/6] tools thermal tmon: Override CFLAGS assignments Jiri Olsa
2019-01-03 13:20 ` tip-bot for Jiri Olsa [this message]
2018-12-12 10:25 ` [PATCH 3/6] tools thermal tmon: Use -O3 instead of -O1 if available Jiri Olsa
2018-12-12 10:25 ` [PATCH 4/6] tools power turbostat: Override CFLAGS assignments and add LDFLAGS to build command Jiri Olsa
2019-01-03 13:21 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2018-12-12 10:25 ` [PATCH 5/6] tools iio: Override CFLAGS assignments Jiri Olsa
2018-12-12 18:50 ` Jonathan Cameron
2018-12-13 11:24 ` Jiri Olsa
2018-12-12 10:25 ` [PATCH 6/6] tools gpio: " Jiri Olsa
2018-12-12 13:15 ` Andy Shevchenko
2018-12-13 11:23 ` Jiri Olsa
2019-01-03 13:21 ` [tip:perf/urgent] tools gpio: Allow overriding CFLAGS tip-bot for Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-ad6b474f445e587e9b56ec44241b1639bccf6738@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=computersforpeace@gmail.com \
--cc=herton@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mmayer@broadcom.com \
--cc=rui.zhang@intel.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox