diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-31 02:17:44 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-31 02:17:44 (EDT) |
| commit | bdf5b1f97d3841107db1479ebf4cbf73257a6d5b (patch) | |
| tree | 6a211f32d045d0904d9d075719a99555c9f997b8 | |
| parent | aebc4bfde332ff50b220af6c93383fcf7e1d53d7 (diff) | |
Revert "build: Disable address sanitization by default"
This reverts commit 0c9789c85ca4542697fbfae82f1ed412ab2b2dbe.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | m4/gcc_version.m4 | 38 |
2 files changed, 43 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bdbf6d9..8970211 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,11 @@ AC_ARG_ENABLE([address-sanitization], [bad value ${enableval} for address-sanitization option] );; esac], - [address_sanitization=no] + [ + address_sanitization=no + gl_GCC_VERSION_IFELSE([4], [8], + [test -d "${srcdir}/.git" && address_sanitization=yes]) + ] ) if test "x${address_sanitization}" = 'xyes'; then AX_CHECK_COMPILE_FLAG([-fsanitize=address], diff --git a/m4/gcc_version.m4 b/m4/gcc_version.m4 new file mode 100644 index 0000000..9e16450 --- /dev/null +++ b/m4/gcc_version.m4 @@ -0,0 +1,38 @@ +dnl Copied from GNU Coreutils configure.ac +dnl +dnl The 17 lines are probably too trivial to be copyrightable, but just in case: +dnl +dnl Copyright (C) 1991-2017 Free Software Foundation, Inc. +dnl +dnl This program is free software: you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program. If not, see <https://www.gnu.org/licenses/>. +dnl +dnl Written by Jim Meyering. + +# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) +# ------------------------------------------------ +# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND. +# Otherwise, run RUN-IF-NOT-FOUND. +AC_DEFUN([gl_GCC_VERSION_IFELSE], + [AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM( + [[ +#if ($1) < __GNUC__ || (($1) == __GNUC__ && ($2) <= __GNUC_MINOR__) +/* ok */ +#else +# error "your version of gcc is older than $1.$2" +#endif + ]]), + ], [$3], [$4]) + ] +) |