summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@users.noreply.github.com>2018-05-22 11:15:28 -0400
committerGitHub <noreply@github.com>2018-05-22 11:15:28 -0400
commit06081c784f231bbf2a4624ed956751bb7768b59f (patch)
tree4a100b3cf841dc553219461ee6a2453cefcfd6b5
parentb16c827adf7e728a8a7e86a89d3361ec2155821b (diff)
parent20cc046f726a937eb494c2225b14c03c7d5ffd96 (diff)
Merge pull request #2220 from LabNConsulting/working/master/fix-asan
*: fix compile with -enable-address-sanitizer configured
-rwxr-xr-xconfigure.ac3
-rw-r--r--tools/lsan-suppressions.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 8b49295444..7c7de19e1f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ AC_ARG_ENABLE([address-sanitizer], AS_HELP_STRING([--enable-address-sanitizer],
[AC_DEFINE(HAVE_ADDRESS_SANITIZER, 1, [enable AddressSanitizer])
CFLAGS="$CFLAGS -fsanitize=address"
CXXFLAGS="$CXXFLAGS -fsanitize=address"
+ LIBS="-ldl $LIBS"
AC_TRY_COMPILE([],[const int i=0;],[AC_MSG_NOTICE([Address Sanitizer Enabled])],
[AC_MSG_ERROR([Address Sanitizer not available])])
])
@@ -202,6 +203,7 @@ AC_ARG_ENABLE([thread-sanitizer], AS_HELP_STRING([--enable-thread-sanitizer], \
[AC_DEFINE(HAVE_THREAD_SANITIZER, 1, [enable ThreadSanitizer])
CFLAGS="$CFLAGS -fsanitize=thread"
CXXFLAGS="$CXXFLAGS -fsanitize=thread"
+ LIBS="-ldl $LIBS"
AC_TRY_COMPILE([],[const int i=0;],[AC_MSG_NOTICE([Thread Sanitizer Enabled])],
[AC_MSG_ERROR([Thread Sanitizer not available])])
])
@@ -212,6 +214,7 @@ AC_ARG_ENABLE([memory-sanitizer], AS_HELP_STRING([--enable-memory-sanitizer], \
[AC_DEFINE(HAVE_THREAD_SANITIZER, 1, [enable MemorySanitizer])
CFLAGS="$CFLAGS -fsanitize=memory -fPIE -pie"
CXXFLAGS="$CXXFLAGS -fsanitize=memory -fPIE -pie"
+ LIBS="-ldl $LIBS"
AC_TRY_COMPILE([],[const int i=0;],[AC_MSG_NOTICE([Memory Sanitizer Enabled])],
[AC_MSG_ERROR([Memory Sanitizer not available])])
])
diff --git a/tools/lsan-suppressions.txt b/tools/lsan-suppressions.txt
index 5184b55699..5d8bf63580 100644
--- a/tools/lsan-suppressions.txt
+++ b/tools/lsan-suppressions.txt
@@ -3,3 +3,4 @@ leak:PyObject_Malloc
leak:PyObject_Realloc
leak:PyList_Append
leak:malloc
+leak:PyObject_GC_Resize