commmon: allow appending extra CFLAGS/LDFLAGS via command line

With this change, user may provide the extra flags CFLAGS/LDFLAGS using the following syntax: Example #1: > make EXTRA_CFLAGS=-finstrument-functions <target> Example #2: > CFLAGS=-finstrument-functions make <target>
krzycz · Nov 10, 2014 · 9b70e63 · 9b70e63
1 parent 612d9ec
commit 9b70e63
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Makefile.inc b/src/Makefile.inc
@@ -67,8 +67,8 @@ vpath %.c ..
 vpath %.h .. ../include
 INCS = -I.. -I../include
 
-CFLAGS += -std=gnu99 -Wall -Werror
-LDFLAGS = -Wl,-z,relro
+CFLAGS += -std=gnu99 -Wall -Werror $(EXTRA_CFLAGS)
+LDFLAGS += -Wl,-z,relro $(EXTRA_LDFLAGS)
 
 LN = ln
 PMEMSOVERSION = 1

diff --git a/src/debug/Makefile b/src/debug/Makefile
@@ -34,7 +34,7 @@
 # src/debug/Makefile -- build the debug versions of the NVM Library
 #
 
-CFLAGS = -ggdb -DDEBUG
+CFLAGS += -ggdb -DDEBUG
 JEMALLOC_OBJROOT = debug
 
 VARIANT_DESTDIR = nvml_debug

diff --git a/src/jemalloc.cfg b/src/jemalloc.cfg
@@ -3,5 +3,5 @@
 --with-private-namespace=je_vmem_
 --disable-xmalloc
 --disable-munmap
-EXTRA_CFLAGS="-DJEMALLOC_LIBVMEM -Werror"
+EXTRA_CFLAGS="-DJEMALLOC_LIBVMEM"
 
diff --git a/src/nondebug/Makefile b/src/nondebug/Makefile
@@ -34,7 +34,7 @@
 # src/nondebug/Makefile -- build the nondebug versions of the NVM Library
 #
 
-CFLAGS = -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+CFLAGS += -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 JEMALLOC_OBJROOT = nondebug
 
 include ../Makefile.inc