From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 9 May 2019 15:07:01 +0000 (+0200)
Subject: - Revert fix for oss-fuzz, error is in that build script that
X-Git-Tag: release-1.9.2rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a922a19d70b148002342dd6707a73fdfcfb64b2e;p=thirdparty%2Funbound.git

- Revert fix for oss-fuzz, error is in that build script that
  unconditionally includes .o files detected by configure, also
  when the machine architecture uses different LIBOBJS files.
---

diff --git a/configure b/configure
index 86fe81293..777649c66 100755
--- a/configure
+++ b/configure
@@ -21089,15 +21089,6 @@ fi
 
 
 
-if echo "$CFLAGS" | grep 'FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION' >/dev/null; then
-	:
-	# do not strip flags, so they are on the command line for fuzzer builds.
-	# because otherwise reallocarray looks like it can link in the
-	# configure test, but doesn't really link at link time.
-	# this is, by the way, safe for production, and keeps the
-	# commandline more explicitly with the compile defines for
-	# special compile settings.
-else
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: Stripping extension flags..." >&5
 $as_echo "$as_me: Stripping extension flags..." >&6;}
@@ -21174,7 +21165,6 @@ $as_echo "#define OMITTED__D_LARGEFILE_SOURCE_1 1" >>confdefs.h
   fi
 
 
-fi
 if test -n "$LATE_LDFLAGS"; then
   LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
 fi
diff --git a/configure.ac b/configure.ac
index c4f123184..abbecf0ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1644,17 +1644,7 @@ fi
 AC_SUBST(ALLTARGET)
 AC_SUBST(INSTALLTARGET)
 
-if echo "$CFLAGS" | grep 'FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION' >/dev/null; then
-	:
-	# do not strip flags, so they are on the command line for fuzzer builds.
-	# because otherwise reallocarray looks like it can link in the
-	# configure test, but doesn't really link at link time.
-	# this is, by the way, safe for production, and keeps the
-	# commandline more explicitly with the compile defines for
-	# special compile settings.
-else
-	ACX_STRIP_EXT_FLAGS
-fi
+ACX_STRIP_EXT_FLAGS
 if test -n "$LATE_LDFLAGS"; then
   LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
 fi
diff --git a/doc/Changelog b/doc/Changelog
index 82ed8db51..fb5ee2423 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+9 May 2019: Wouter
+	- Revert fix for oss-fuzz, error is in that build script that
+	  unconditionally includes .o files detected by configure, also
+	  when the machine architecture uses different LIBOBJS files.
+
 8 May 2019: Wouter
 	- Attempt to fix build failure in oss-fuzz because of reallocarray.
 	  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14648.