|
 |
796acd |
From 5887fddd54040701f05e524f014def12dcb788ac Mon Sep 17 00:00:00 2001
|
|
|
796acd |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
796acd |
Date: Mon, 12 Jul 2021 21:36:50 +0400
|
|
|
796acd |
Subject: [PATCH] build-sys: carry configure-time CFLAGS
|
|
|
796acd |
MIME-Version: 1.0
|
|
|
796acd |
Content-Type: text/plain; charset=UTF-8
|
|
|
796acd |
Content-Transfer-Encoding: 8bit
|
|
|
796acd |
|
|
|
796acd |
Reported: https://github.com/stefanberger/swtpm/issues/483
|
|
|
796acd |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
796acd |
---
|
|
|
796acd |
samples/Makefile.am | 2 ++
|
|
|
796acd |
src/swtpm_setup/Makefile.am | 2 ++
|
|
|
796acd |
2 files changed, 4 insertions(+)
|
|
|
796acd |
|
|
|
796acd |
diff --git a/samples/Makefile.am b/samples/Makefile.am
|
|
|
796acd |
index dcbc9b6..d56da0f 100644
|
|
|
796acd |
--- a/samples/Makefile.am
|
|
|
796acd |
+++ b/samples/Makefile.am
|
|
|
796acd |
@@ -39,11 +39,13 @@ swtpm_localca_LDADD = \
|
|
|
796acd |
|
|
|
796acd |
swtpm_localca_LDFLAGS = \
|
|
|
796acd |
-L$(top_builddir)/src/utils -lswtpm_utils \
|
|
|
796acd |
+ $(AM_LDFLAGS) \
|
|
|
796acd |
$(HARDENING_LDFLAGS) \
|
|
|
796acd |
$(GLIB_LIBS)
|
|
|
796acd |
|
|
|
796acd |
swtpm_localca_CFLAGS = \
|
|
|
796acd |
-I$(top_srcdir)/src/utils \
|
|
|
796acd |
+ $(AM_CFLAGS) \
|
|
|
796acd |
$(HARDENING_CFLAGS) \
|
|
|
796acd |
$(GLIB_CFLAGS)
|
|
|
796acd |
|
|
|
796acd |
diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
|
|
|
796acd |
index 045bdb1..1f5b880 100644
|
|
|
796acd |
--- a/src/swtpm_setup/Makefile.am
|
|
|
796acd |
+++ b/src/swtpm_setup/Makefile.am
|
|
|
796acd |
@@ -28,6 +28,7 @@ swtpm_setup_LDADD = \
|
|
|
796acd |
|
|
|
796acd |
swtpm_setup_LDFLAGS = \
|
|
|
796acd |
-L$(top_builddir)/src/utils -lswtpm_utils \
|
|
|
796acd |
+ $(AM_LDFLAGS) \
|
|
|
796acd |
$(HARDENING_LDFLAGS) \
|
|
|
796acd |
$(GLIB_LIBS) \
|
|
|
796acd |
$(JSON_GLIB_LIBS) \
|
|
|
796acd |
@@ -38,6 +39,7 @@ swtpm_setup_CFLAGS = \
|
|
|
796acd |
-I$(top_srcdir)/include \
|
|
|
796acd |
-I$(top_srcdir)/include/swtpm \
|
|
|
796acd |
-I$(top_srcdir)/src/utils \
|
|
|
796acd |
+ $(AM_CFLAGS) \
|
|
|
796acd |
$(HARDENING_CFLAGS) \
|
|
|
796acd |
$(GLIB_CFLAGS) \
|
|
|
796acd |
$(JSON_GLIB_CFLAGS)
|
|
|
796acd |
--
|
|
|
796acd |
2.32.0.93.g670b81a890
|
|
|
796acd |
|