From 932dc4e270701d508f032e0744e98134995673fa Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Fri, 4 Jun 2021 08:04:21 -0400 Subject: [PATCH] build-sys: Add HARDENING_CFLAGS and _LDFLAGS to all C programs Add the HARDENING_CFLAGS and _LDFLAGS to all C programs. Signed-off-by: Stefan Berger --- samples/Makefile.am | 2 ++ src/swtpm_bios/Makefile.am | 6 +++++- src/swtpm_ioctl/Makefile.am | 6 +++++- src/utils/Makefile.am | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/samples/Makefile.am b/samples/Makefile.am index 1a7df00..dcbc9b6 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am @@ -39,10 +39,12 @@ swtpm_localca_LDADD = \ swtpm_localca_LDFLAGS = \ -L$(top_builddir)/src/utils -lswtpm_utils \ + $(HARDENING_LDFLAGS) \ $(GLIB_LIBS) swtpm_localca_CFLAGS = \ -I$(top_srcdir)/src/utils \ + $(HARDENING_CFLAGS) \ $(GLIB_CFLAGS) install-data-local: diff --git a/src/swtpm_bios/Makefile.am b/src/swtpm_bios/Makefile.am index a5ba2f2..c7c3016 100644 --- a/src/swtpm_bios/Makefile.am +++ b/src/swtpm_bios/Makefile.am @@ -12,7 +12,11 @@ bin_PROGRAMS = \ swtpm_bios_CFLAGS = \ -I$(top_builddir)/include \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + $(HARDENING_CFLAGS) + +swtpm_bios_LDFLAGS = \ + $(HARDENING_LDFLAGS) swtpm_bios_SOURCES = tpm_bios.c diff --git a/src/swtpm_ioctl/Makefile.am b/src/swtpm_ioctl/Makefile.am index e0253a2..cc8388c 100644 --- a/src/swtpm_ioctl/Makefile.am +++ b/src/swtpm_ioctl/Makefile.am @@ -13,7 +13,11 @@ swtpm_ioctl_SOURCES = tpm_ioctl.c swtpm_ioctl_CFLAGS = \ -I$(top_builddir)/include \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + $(HARDENING_CFLAGS) + +swtpm_ioctl_LDFLAGS = \ + $(HARDENING_LDFLAGS) EXTRA_DIST = \ README diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 8e614c6..0780a6c 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -11,7 +11,11 @@ noinst_LTLIBRARIES = \ libswtpm_utils.la libswtpm_utils_la_CFLAGS = \ + $(HARDENING_CFLAGS) \ $(GLIB_CFLAGS) +libswtpm_utils_la_LDFLAGS = \ + $(HARDENING_LDFLAGS) + libswtpm_utils_la_SOURCES = \ swtpm_utils.c