From 9665f63301798416032ea38dd62386ba0b14b842 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Fri, 12 Mar 2021 12:11:03 -0800 Subject: [PATCH] Prevent use of LeakSanitizer on FreeBSD --- auxil/bifcl | 2 +- auxil/binpac | 2 +- auxil/broker | 2 +- zeek-config.h.in | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/auxil/bifcl b/auxil/bifcl index d356e4716e..5ae0f36c8d 160000 --- a/auxil/bifcl +++ b/auxil/bifcl @@ -1 +1 @@ -Subproject commit d356e4716ef22e6175fe5dd4f3c49b8c4c892214 +Subproject commit 5ae0f36c8dd1c55b9a45fc2bec0db26649abfb86 diff --git a/auxil/binpac b/auxil/binpac index daaecd4c76..cc9b94083e 160000 --- a/auxil/binpac +++ b/auxil/binpac @@ -1 +1 @@ -Subproject commit daaecd4c76317b91d625f4919f7f104e9e6d76fa +Subproject commit cc9b94083e9c4d7215e930cba20cd6db1114599a diff --git a/auxil/broker b/auxil/broker index c6779fb4dc..47a0d20389 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit c6779fb4dc5a636eb75e14f6306548bbc0386767 +Subproject commit 47a0d20389fd4c4611ad702ce60c324182ed36e1 diff --git a/zeek-config.h.in b/zeek-config.h.in index 5f5497f8a5..8cc0c013d5 100644 --- a/zeek-config.h.in +++ b/zeek-config.h.in @@ -260,7 +260,8 @@ extern const char* BRO_VERSION_FUNCTION(); #endif #endif -#if defined(ZEEK_ASAN) +// FreeBSD doesn't support LeakSanitizer +#if defined(ZEEK_ASAN) && !defined(__FreeBSD__) #include #define ZEEK_LSAN_CHECK(x) __lsan_do_leak_check(x) #define ZEEK_LSAN_ENABLE(x) __lsan_enable(x)