diff options
| author |   Eric Blake <eblake@redhat.com> | 2012-06-04 11:33:20 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-06-04 12:08:27 -0600 |
| commit | 2af63b1c349114df98c163a8401fd9cf2facdabe (patch) | |
| tree | cafb1bb4edee809cc2c626db8d7a7e4470477494 | |
| parent | fix make syntax-check failed (diff) | |
| download | libvirt-2af63b1c349114df98c163a8401fd9cf2facdabe.tar.gz libvirt-2af63b1c349114df98c163a8401fd9cf2facdabe.tar.bz2 libvirt-2af63b1c349114df98c163a8401fd9cf2facdabe.zip | |
build: allow building with newer glibc-headers and -O0
glibc 2.15 (on Fedora 17) coupled with explicit disabling of
optimization during development dies a painful death:
In file included from /usr/include/limits.h:27:0,
from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/limits.h:169,
from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/syslimits.h:7,
from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/limits.h:34,
from util/bitmap.c:26:
/usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
cc1: all warnings being treated as errors
Work around this by only conditionally defining _FORTIFY_SOURCE,
in the case where glibc can actually use it. The trick is using
AH_VERBATIM instead of AC_DEFINE.
* m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): Squelch
_FORTIFY_SOURCE when needed to avoid glibc #warnings.
| -rw-r--r-- | m4/virt-compile-warnings.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 5527bff50..a91d69f46 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -102,8 +102,12 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Silence certain warnings in gnulib, and use improved glibc headers AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings. */ + #if __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc |