From 1e1e477d850e325ed9df9981a21a1e1519d4f106 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Sun, 4 Mar 2018 17:08:21 +0800
Subject: [PATCH] set up CXX for fuzzing build

---
 Makefile.in  | 2 ++
 configure.ac | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 479e188..124b0e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,6 +70,8 @@ ifeq (@DROPBEAR_FUZZ@, 1)
 	dbclientobjs=$(allobjs) cli-main.o
 	dropbearkeyobjs=$(allobjs) $(KEYOBJS)
 	dropbearconvertobjs=$(allobjs) $(CONVERTOBJS)
+	# CXX only set when fuzzing
+	CXX=@CXX@
 else
 	dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
 	dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
diff --git a/configure.ac b/configure.ac
index d1b2602..c0bb8a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -329,6 +329,8 @@ AC_ARG_ENABLE(fuzz,
 		AC_DEFINE(DROPBEAR_FUZZ, 1, Fuzzing)
 		AC_MSG_NOTICE(Enabling fuzzing)
 		DROPBEAR_FUZZ=1
+		# libfuzzer needs linking with c++ libraries
+		AC_PROG_CXX
 	],
 	[
 		AC_DEFINE(DROPBEAR_FUZZ, 0, Fuzzing)
@@ -337,6 +339,7 @@ AC_ARG_ENABLE(fuzz,
 
 )
 AC_SUBST(DROPBEAR_FUZZ)
+AC_SUBST(CXX)
 
 # Checks for header files.
 AC_HEADER_STDC