From 4839807340cc73d5ba826dff4b4ba358775a213d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 24 Sep 2018 13:11:34 -0400 Subject: [PATCH] [check-static-inits.sh] Allow some if ubsan is in effect --- src/check-static-inits.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/check-static-inits.sh b/src/check-static-inits.sh index 71551cbd4..def25c701 100755 --- a/src/check-static-inits.sh +++ b/src/check-static-inits.sh @@ -7,7 +7,6 @@ test -z "$srcdir" && srcdir=. test -z "$libs" && libs=.libs stat=0 - if which objdump 2>/dev/null >/dev/null; then : else @@ -31,7 +30,8 @@ done echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff" for obj in $OBJS; do - if objdump -t "$obj" | grep '__cxa_'; then + if objdump -t "$obj" | grep -q '__cxa_' && ! objdump -t "$obj" | grep -q __ubsan_handle; then + objdump -t "$obj" | grep '__cxa_' echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff" stat=1 fi