lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH trace-cmd 1/1] Makefile: Use CPPFLAGS from the environment
Date
CPPFLAGS is commonly used for preprecessor definitions which
should be used when compiling C and C++ files. In particular,
Debian uses it to pass hardening flags and expects those flags
to be used.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
Makefile | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a2ba385..f097bbc 100644
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,7 @@ include features.mk

# Set compile option CFLAGS if not set elsewhere
CFLAGS ?= -g -Wall
+CPPFLAGS ?=
LDFLAGS ?=

# Required CFLAGS
@@ -263,7 +264,7 @@ endif

do_fpic_compile = \
($(print_fpic_compile) \
- $(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(EXT) -fPIC $< -o $@)

do_app_build = \
($(print_app_build) \
@@ -275,7 +276,7 @@ do_compile_shared_library = \

do_compile_plugin_obj = \
($(print_plugin_obj_compile) \
- $(CC) -c $(CFLAGS) -fPIC -o $@ $<)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $<)

do_plugin_build = \
($(print_plugin_build) \
@@ -291,7 +292,7 @@ define check_gui
$(REBUILD_GUI); \
else \
$(print_compile) \
- $(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@; \
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(EXT) $< -o $(obj)/$@; \
fi;
endef

@@ -449,10 +450,10 @@ define check_gui_deps
if [ $(BUILDGUI) -ne 1 ]; then \
$(REBUILD_GUI); \
else \
- $(CC) -M $(CFLAGS) $< > $@; \
+ $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@; \
fi \
elif [ $(BUILDGUI) -eq 0 ]; then \
- $(CC) -M $(CFLAGS) $< > $@; \
+ $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@; \
else \
echo SKIPPING $@; \
fi;
@@ -569,12 +570,12 @@ PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`

ctracecmd.so: $(TCMD_LIB_OBJS) ctracecmd.i
swig -Wall -python -noproxy ctracecmd.i
- $(CC) -fpic -c $(CFLAGS) $(PYTHON_INCLUDES) ctracecmd_wrap.c
+ $(CC) -fpic -c $(CPPFLAGS) $(CFLAGS) $(PYTHON_INCLUDES) ctracecmd_wrap.c
$(CC) --shared $(TCMD_LIB_OBJS) $(LDFLAGS) ctracecmd_wrap.o -o ctracecmd.so

ctracecmdgui.so: $(TRACE_VIEW_OBJS) $(LIB_FILE)
swig -Wall -python -noproxy ctracecmdgui.i
- $(CC) -fpic -c $(CFLAGS) $(INCLUDES) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) ctracecmdgui_wrap.c
+ $(CC) -fpic -c $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) ctracecmdgui_wrap.c
$(CC) --shared $^ $(LDFLAGS) $(LIBS) $(CONFIG_LIBS) ctracecmdgui_wrap.o -o ctracecmdgui.so

PHONY += python
@@ -590,7 +591,7 @@ CFLAGS_plugin_python.o += $(PYTHON_DIR_SQ)

do_compile_python_plugin_obj = \
($(print_plugin_obj_compile) \
- $(CC) -c $(CFLAGS) $(CFLAGS_$@) $(PYTHON_INCLUDES) -fPIC -o $@ $<)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$@) $(PYTHON_INCLUDES) -fPIC -o $@ $<)

do_python_plugin_build = \
($(print_plugin_build) \
--
1.8.3.2


\
 
 \ /
  Last update: 2014-01-06 19:21    [W:0.494 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site