mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-01-18 20:52:53 -05:00
- 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.
This commit is contained in:
parent
a8d0177b36
commit
a922a19d70
3 changed files with 6 additions and 21 deletions
10
configure
vendored
10
configure
vendored
|
|
@ -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
|
||||
|
|
|
|||
12
configure.ac
12
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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue