summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-11-10 22:09:02 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-11-10 22:09:02 -0600
commitcf08676c00ad7450a00a1341b0738f628c402342 (patch)
tree7874b525e24877160b27f0a3249ccb1e20352bc9
parentda68b185b3469361c33b47d93455624aac2e5e5d (diff)
parenta562fbe618e0e3b034e7006314b4ea1dfef6d732 (diff)
Merge "build: Fix default values for some SANITIZER options" into 13
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index a82dcdcff..0446c4571 100755
--- a/configure
+++ b/configure
@@ -18374,7 +18374,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
$as_echo "yes" >&6; }
AST_ADDRESS_SANITIZER=1
else
- AST_ADDRESS_SANITIZER=
+ AST_ADDRESS_SANITIZER=0
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -18406,7 +18406,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
$as_echo "yes" >&6; }
AST_THREAD_SANITIZER=1
else
- AST_THREAD_SANITIZER=
+ AST_THREAD_SANITIZER=0
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
diff --git a/configure.ac b/configure.ac
index 42320e4f2..e4a20cfa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1106,7 +1106,7 @@ AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([], [int x = 1;])],
AC_MSG_RESULT(yes)
[AST_ADDRESS_SANITIZER=1],
- [AST_ADDRESS_SANITIZER=]
+ [AST_ADDRESS_SANITIZER=0]
AC_MSG_RESULT(no)
)
CFLAGS="${saved_sanitize_CFLAGS}"
@@ -1122,7 +1122,7 @@ AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([], [int x = 1;])],
AC_MSG_RESULT(yes)
[AST_THREAD_SANITIZER=1],
- [AST_THREAD_SANITIZER=]
+ [AST_THREAD_SANITIZER=0]
AC_MSG_RESULT(no)
)
CFLAGS="${saved_sanitize_CFLAGS}"