diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-07-07 14:42:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 14:42:42 +0200 |
| commit | 540326f3ffcc3126a1db3811464046ac7e061157 (patch) | |
| tree | 38f9a214b760bbb51efddc09ee60adb99a06cb09 | |
| parent | 94bf7b0130c1fd447624a9a91d2d125eaac91ea7 (diff) | |
| parent | 9bbcc2548e7084a38a76e292e52b38158fd0a667 (diff) | |
Merge pull request #953 from lnslbrty/fix/broken-autoconf-fsanitizer
fix broken sanitizer CFLAGS, --enable-fuzztargets should also set -fs…
| -rw-r--r-- | configure.seed | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/configure.seed b/configure.seed index 10824b442..1a385f06d 100644 --- a/configure.seed +++ b/configure.seed @@ -4,11 +4,13 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects]) -AC_ARG_WITH(sanitizer, [ --with-sanitizer Build with support for address, undefined and leak sanitizer]) +AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer])) +AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no]) +AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"]) -AS_IF([test "${with_sanitizer+set}" = set],[ - CFLAGS="${CFLAGS} -g3 -O0 -Wno-unused-value -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer" - LDFLAGS="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak" +AS_IF([test "${with_sanitizer+set}" = set -o "x$enable_fuzztargets" = "xyes"],[ + CFLAGS+="${CFLAGS} -g3 -O0 -Wno-unused-value -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer" + LDFLAGS+="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak" ]) LT_INIT @@ -125,10 +127,6 @@ AC_ARG_ENABLE([debug-messages], AS_HELP_STRING([--enable-debug-messages], [Define NDPI_ENABLE_DEBUG_MESSAGES=1]), [ AC_DEFINE(NDPI_ENABLE_DEBUG_MESSAGES, 1, [Enable ndpi_debug_messages]) ]) -AC_ARG_ENABLE(fuzztargets, - AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no]) -AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"]) - @FUZZY@ AS_IF([test "x$enable_fuzztargets" = "xyes"], [ @FUZZY@ AC_PROG_CXX @FUZZY@ AC_LANG_PUSH(C++) |