git » libfiu » commit c3f3818

Honour CPPFLAGS and LDFLAGS when building shared libraries

author Alberto Bertogli
2019-01-07 20:32:17 UTC
committer Alberto Bertogli
2019-09-09 23:35:20 UTC
parent 07253dcb9c8a1869dce5182604946be0b894e303
Honour CPPFLAGS and LDFLAGS when building shared libraries

This patch makes the build system honour CPPFLAGS and LDFLAGS when
building the shared libraries.

This allows better integration with Debian's build system, in particular
wrt. the hardening choices.

Thanks to Chris Lamb (lamby@debian.org) for reporting this issue, and
help troubleshooting.
libfiu/Makefile +2 -1
preload/posix/Makefile +1 -1
preload/run/Makefile +2 -1 
diff --git a/libfiu/Makefile b/libfiu/Makefile
index 6c2b90d..98d57ec 100644
--- a/libfiu/Makefile
+++ b/libfiu/Makefile
@@ -1,6 +1,7 @@
 
 CFLAGS += -std=c99 -pedantic -Wall
-ALL_CFLAGS = -D_XOPEN_SOURCE=600 -fPIC -DFIU_ENABLE=1 $(CFLAGS)
+ALL_CFLAGS = -D_XOPEN_SOURCE=600 -fPIC -DFIU_ENABLE=1 \
+		$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 # Optimization CFLAGS, only used when doing a non-debug build.
 OPT_CFLAGS = -O3
diff --git a/preload/posix/Makefile b/preload/posix/Makefile
index 6ef224b..5c6162c 100644
--- a/preload/posix/Makefile
+++ b/preload/posix/Makefile
@@ -2,7 +2,7 @@
 CFLAGS += -std=c99 -Wall -O3
 ALL_CFLAGS = -D_XOPEN_SOURCE=600 -fPIC -DFIU_ENABLE=1 \
 		-D_LARGEFILE64_SOURCE=1 -I. -I../../libfiu/ \
-		$(CFLAGS)
+		$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 ifdef DEBUG
 ALL_CFLAGS += -g
diff --git a/preload/run/Makefile b/preload/run/Makefile
index 448413d..5ad08e4 100644
--- a/preload/run/Makefile
+++ b/preload/run/Makefile
@@ -1,7 +1,8 @@
 
 CFLAGS += -std=c99 -Wall -O3
 ALL_CFLAGS = -D_XOPEN_SOURCE=600 -fPIC -DFIU_ENABLE=1 \
-		-I. -I../../libfiu/ $(CFLAGS)
+		-I. -I../../libfiu/ \
+		$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 ifdef DEBUG
 ALL_CFLAGS += -g