Mercurial > dropbear

changeset 1582:68abf717328d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set up CXX for fuzzing build
author Matt Johnston <matt@ucc.asn.au>
date Sun, 04 Mar 2018 17:08:21 +0800
parents 950913ea9976
children d17a6bab2179
files Makefile.in configure.ac
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sun Mar 04 15:18:20 2018 +0800
+++ b/Makefile.in	Sun Mar 04 17:08:21 2018 +0800
@@ -70,6 +70,8 @@
 	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)
--- a/configure.ac	Sun Mar 04 15:18:20 2018 +0800
+++ b/configure.ac	Sun Mar 04 17:08:21 2018 +0800
@@ -329,6 +329,8 @@
 		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_SUBST(DROPBEAR_FUZZ)
+AC_SUBST(CXX)
 
 # Checks for header files.
 AC_HEADER_STDC