diff options
| author | Alon Levy <alevy@redhat.com> | 2012-06-06 16:03:53 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2012-06-06 17:32:02 +0300 |
| commit | d905a1f24c93e99812388f6def42f8285c2acc6c (patch) | |
| tree | 83f7e416b07786d6cabcb57c85bd5aadf63a848c | |
| parent | 70c706e0b594e5dc38230b970e2d438cf526eed6 (diff) | |
| download | spice-d905a1f24c93e99812388f6def42f8285c2acc6c.tar.gz spice-d905a1f24c93e99812388f6def42f8285c2acc6c.tar.xz spice-d905a1f24c93e99812388f6def42f8285c2acc6c.zip | |
m4/spice-compile-warnings: Squelch _FORTIFY_SOURCE when needed to avoid glibc #warnings.
Fix copied from libvirt, commit by Eric Blake.
glibc 2.15 (on Fedora 17) coupled with explicit disabling of
optimization during development dies a painful death:
/usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
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.
| -rw-r--r-- | m4/spice-compile-warnings.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/spice-compile-warnings.m4 b/m4/spice-compile-warnings.m4 index 601ecf8c..959971a2 100644 --- a/m4/spice-compile-warnings.m4 +++ b/m4/spice-compile-warnings.m4 @@ -111,8 +111,12 @@ AC_DEFUN([SPICE_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=20460]) # Use improved glibc headers - 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 |