diff mbox series

[i2c-tools,v2] allow to preset custom CFLAGS and LDFLAGS

Message ID 20200807111230.1241-1-wsa@kernel.org
State Accepted
Headers show
Series [i2c-tools,v2] allow to preset custom CFLAGS and LDFLAGS | expand

Commit Message

Wolfram Sang Aug. 7, 2020, 11:12 a.m. UTC 
Sometimes I need to add some flags (like -static for the linker), so
allow this for all CFLAGS and LDFLAGS used in this project.

Signed-off-by: Wolfram Sang <wsa@kernel.org>
---

Changes since v1:
	* update all Module.mk, not just tools
	* add entry to CHANGES

 CHANGES          | 1 +
 eeprog/Module.mk | 6 +++---
 lib/Module.mk    | 2 +-
 tools/Module.mk  | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

Comments

Wolfram Sang Aug. 10, 2020, 9:56 a.m. UTC | #1 
On Fri, Aug 07, 2020 at 01:12:30PM +0200, Wolfram Sang wrote:
> Sometimes I need to add some flags (like -static for the linker), so
> allow this for all CFLAGS and LDFLAGS used in this project.
> 
> Signed-off-by: Wolfram Sang <wsa@kernel.org>

Applied to master.
diff mbox series

Patch

diff --git a/CHANGES b/CHANGES
index e3ff3a0..f5c7d33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@  i2c-tools CHANGES
 -----------------
 
 master
+  Makefile: allow to preset all CFLAGS and LDFLAGS variables
   tools: Consistently use snprintf instead of sprintf
          Restrict addresses 0x03-0x07, too (defined by I2C standard)
   decode-dimms: Print SPD revision for DDR3 too
diff --git a/eeprog/Module.mk b/eeprog/Module.mk
index ac3a368..3f442aa 100644
--- a/eeprog/Module.mk
+++ b/eeprog/Module.mk
@@ -7,11 +7,11 @@ 
 
 EEPROG_DIR	:= eeprog
 
-EEPROG_CFLAGS	:= -Iinclude
+EEPROG_CFLAGS	+= -Iinclude
 ifeq ($(USE_STATIC_LIB),1)
-EEPROG_LDFLAGS	:= $(LIB_DIR)/$(LIB_STLIBNAME)
+EEPROG_LDFLAGS	+= $(LIB_DIR)/$(LIB_STLIBNAME)
 else
-EEPROG_LDFLAGS	:= -L$(LIB_DIR) -li2c
+EEPROG_LDFLAGS	+= -L$(LIB_DIR) -li2c
 endif
 
 EEPROG_TARGETS	:= eeprog
diff --git a/lib/Module.mk b/lib/Module.mk
index 46a1c91..6727de7 100644
--- a/lib/Module.mk
+++ b/lib/Module.mk
@@ -9,7 +9,7 @@ 
 
 LIB_DIR		:= lib
 
-LIB_CFLAGS	:= -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
+LIB_CFLAGS	+= -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
 		   -Wcast-align -Wwrite-strings -Wnested-externs -Winline \
 		   -W -Wundef -Wmissing-prototypes -Iinclude
 
diff --git a/tools/Module.mk b/tools/Module.mk
index 693102f..f5b133d 100644
--- a/tools/Module.mk
+++ b/tools/Module.mk
@@ -9,13 +9,13 @@ 
 
 TOOLS_DIR	:= tools
 
-TOOLS_CFLAGS	:= -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
+TOOLS_CFLAGS	+= -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
 		   -Wcast-align -Wwrite-strings -Wnested-externs -Winline \
 		   -W -Wundef -Wmissing-prototypes -Iinclude
 ifeq ($(USE_STATIC_LIB),1)
-TOOLS_LDFLAGS	:= $(LIB_DIR)/$(LIB_STLIBNAME)
+TOOLS_LDFLAGS	+= $(LIB_DIR)/$(LIB_STLIBNAME)
 else
-TOOLS_LDFLAGS	:= -L$(LIB_DIR) -li2c
+TOOLS_LDFLAGS	+= -L$(LIB_DIR) -li2c
 endif
 
 TOOLS_TARGETS	:= i2cdetect i2cdump i2cset i2cget i2ctransfer