linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] trace-cmd: append to CFLAGS instead of being overriden
@ 2010-06-13 17:11 Chase Douglas
  2010-06-13 17:11 ` [PATCH] trace-cmd: prevent print_graph_duration buffer overflow Chase Douglas
  0 siblings, 1 reply; 10+ messages in thread
From: Chase Douglas @ 2010-06-13 17:11 UTC (permalink / raw)
  To: Steven Rostedt; +Cc: linux-kernel

Most package builders apply their own CFLAGS, often set during the make
invocation. The trace-cmd internal CFLAGS is overriden in this case.
Make sure the important flags are appended.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index a278510..08fc4ca 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,11 @@ KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
 
 INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
 
-CFLAGS = -g -Wall $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
+# Set compile option CFLAGS if not set elsewhere
+CFLAGS ?= -g -Wall
+
+# Append required CFLAGS
+override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
 
 ifeq ($(VERBOSE),1)
   Q =
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2010-06-15 13:20 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-13 17:11 [PATCH] trace-cmd: append to CFLAGS instead of being overriden Chase Douglas
2010-06-13 17:11 ` [PATCH] trace-cmd: prevent print_graph_duration buffer overflow Chase Douglas
2010-06-13 20:52   ` Valdis.Kletnieks
2010-06-13 21:01     ` Chase Douglas
2010-06-14 21:40       ` Valdis.Kletnieks
2010-06-15  0:16         ` Steven Rostedt
2010-06-15 12:49           ` Frederic Weisbecker
2010-06-15 13:04             ` Chase Douglas
2010-06-15 13:10               ` Frederic Weisbecker
2010-06-15 13:20                 ` Chase Douglas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).