new file mode 100644
@@ -0,0 +1,37 @@
+From 23fed12c9b459712295b2dfe41f3480673e4a3af Mon Sep 17 00:00:00 2001
+From: John Andersen <john.s.andersen@intel.com>
+Date: Thu, 19 Dec 2019 08:51:20 -0800
+Subject: [PATCH] configure: Only use CXX when fuzzing
+
+Fixes: #1508
+
+Signed-off-by: John Andersen <john.s.andersen@intel.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cd50451d..537e3cff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,6 @@ AC_CANONICAL_HOST
+ AX_IS_RELEASE(dash-version)
+ AX_CHECK_ENABLE_DEBUG([info])
+
+-AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_USE_SYSTEM_EXTENSIONS
+@@ -287,7 +286,8 @@ AS_CASE(["x$with_fuzzing"],
+ [AC_MSG_ERROR([Bad value for --with-fuzzing])])
+ AM_CONDITIONAL([ENABLE_FUZZING],[test "x$with_fuzzing" != "xnone"])
+ AS_IF([test "x$with_fuzzing" != "xnone"],
+- [AS_IF([test "x$enable_tcti_fuzzing" = xno],
++ [AC_PROG_CXX
++ AS_IF([test "x$enable_tcti_fuzzing" = xno],
+ AC_MSG_ERROR([Fuzz tests can not be enabled without the TCTI_FUZZING module]))
+ AS_IF([test "x$GEN_FUZZ" != "x1"],
+ AC_MSG_ERROR([Fuzz tests can not be enabled without "GEN_FUZZ=1" variable]))])
+--
+2.18.1
+
@@ -11,6 +11,8 @@ TPM2_TSS_LICENSE_FILES = LICENSE
TPM2_TSS_INSTALL_STAGING = YES
TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf
TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc --disable-defaultflags
+# 0001-configure-Only-use-CXX-when-fuzzing.patch
+TPM2_TSS_AUTORECONF = YES
# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"