Skip to content

Commit baba1c0

Browse files
Include gh-157934 fix.
1 parent f63d3cc commit baba1c0

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

‎configure‎

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3551,8 +3551,11 @@ AX_CHECK_COMPILE_FLAG([$hwasan_flags],[
35513551
BASECFLAGS="$hwasan_flags -fno-omit-frame-pointer $BASECFLAGS"
35523552
LDFLAGS="$hwasan_flags $LDFLAGS"
35533553
],[AC_MSG_ERROR([The selected compiler doesn't support hardware address sanitizer])])
3554-
# HWASan works by controlling memory allocation, our own malloc interferes.
3555-
with_pymalloc="no"
3554+
# HWASan works by controlling memory allocation, our own malloc interferes,
3555+
# so disable it by default, but allow --with-pymalloc to override.
3556+
if test -z "$with_pymalloc"; then
3557+
with_pymalloc="no"
3558+
fi
35563559
],
35573560
[AC_MSG_RESULT([no])])
35583561

0 commit comments

Comments
 (0)