summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2019-01-15 11:15:19 +0100
committerPeter Korsgaard <peter@korsgaard.com>2019-01-16 14:24:56 +0100
commitdb828b919214db5cc2cbce644a75db3e3d4f74d6 (patch)
tree7761ca3764252fd6a52c512d057e9b98cb3da406
parent2bf187c2b135ff9af748257c591b3f9851f4c9cf (diff)
downloadbuildroot-db828b919214db5cc2cbce644a75db3e3d4f74d6.tar.gz
buildroot-db828b919214db5cc2cbce644a75db3e3d4f74d6.zip
tpm2-abrmd: do not enforce -fstack-protector-all
Stack protection is now controlled Buildroot wide with the BR2_SSP_* options, so disable the explicit -fstack-protector-all so the SSP logic in the toolchain wrapper is used instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/tpm2-abrmd/tpm2-abrmd.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk
index 74cc66ba20..2834615ac3 100644
--- a/package/tpm2-abrmd/tpm2-abrmd.mk
+++ b/package/tpm2-abrmd/tpm2-abrmd.mk
@@ -11,9 +11,10 @@ TPM2_ABRMD_LICENSE_FILES = LICENSE
TPM2_ABRMD_INSTALL_STAGING = YES
TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf
-# configure.ac doesn't contain a link test, so it doesn't detect when
-# libssp is missing.
-TPM2_ABRMD_CONF_ENV = ax_cv_check_cflags___________Werror_______fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
+# -fstack-protector-all is used by default. Disable that so the
+# BR2_SSP_* options in the toolchain wrapper are used instead
+TPM2_ABRMD_CONF_ENV = \
+ ax_cv_check_cflags___________Werror_______fstack_protector_all=no
TPM2_ABRMD_CONF_OPTS += \
--with-systemdsystemunitdir=$(if $(BR2_INIT_SYSTEMD),/usr/lib/systemd/system,no) \
OpenPOWER on IntegriCloud