diff options
| author | Manolis Ragkousis <manolis837@gmail.com> | 2015-08-26 23:48:33 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-06 20:56:18 +0200 |
| commit | ccdc039c9d1f7b2efe23a156b2c72a50e64453e4 (patch) | |
| tree | 81b4532e30cea7ac0a3994d82ae3f380eca1a08c /sysdeps | |
| parent | bd9e69abb887d78d0d6708fc089cc9f3eabf106d (diff) | |
| download | glibc-ccdc039c9d1f7b2efe23a156b2c72a50e64453e4.tar glibc-ccdc039c9d1f7b2efe23a156b2c72a50e64453e4.tar.gz glibc-ccdc039c9d1f7b2efe23a156b2c72a50e64453e4.tar.bz2 glibc-ccdc039c9d1f7b2efe23a156b2c72a50e64453e4.zip | |
Check sysheaders when looking for Mach and Hurd headers
* sysdeps/mach/configure.ac: Add sysheaders check.
* sysdeps/mach/configure: Regenerate.
* sysdeps/mach/hurd/configure.ac: Add sysheaders check.
* sysdeps/mach/hurd/configure: Regenerate.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/configure | 9 | ||||
| -rw-r--r-- | sysdeps/mach/configure.ac | 9 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/configure | 9 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/configure.ac | 9 |
4 files changed, 36 insertions, 0 deletions
diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index 228f99ef9e..4d2a4e3658 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -165,6 +165,11 @@ fi config_vars="$config_vars MIG = $MIG" +if test -n "$sysheaders"; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $SYSINCLUDES" +fi + ### Sanity checks for Mach header installation @@ -553,3 +558,7 @@ if test $hurd_cv_mig_retcode = yes; then $as_echo "#define HAVE_MIG_RETCODE 1" >>confdefs.h fi + +if test -n "$sysheaders"; then + CPPFLAGS=$OLD_CPPFLAGS +fi diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac index db85f47eae..00b660c550 100644 --- a/sysdeps/mach/configure.ac +++ b/sysdeps/mach/configure.ac @@ -6,6 +6,11 @@ if test "x$MIG" = xMISSING; then fi LIBC_CONFIG_VAR([MIG], [$MIG]) +if test -n "$sysheaders"; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $SYSINCLUDES" +fi + ### Sanity checks for Mach header installation AC_CHECK_HEADER(mach/mach_types.h,, [AC_MSG_ERROR([cannot find Mach headers])], -) @@ -124,3 +129,7 @@ if test $hurd_cv_mig_retcode = yes; then fi]) hurd_MIG_RETCODE + +if test -n "$sysheaders"; then + CPPFLAGS=$OLD_CPPFLAGS +fi diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure index 4248758b30..3d155a450e 100644 --- a/sysdeps/mach/hurd/configure +++ b/sysdeps/mach/hurd/configure @@ -3,6 +3,11 @@ $as_echo "#define NO_HIDDEN 1" >>confdefs.h +if test -n "$sysheaders"; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $SYSINCLUDES" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Hurd header version" >&5 $as_echo_n "checking Hurd header version... " >&6; } @@ -36,3 +41,7 @@ $as_echo "$libc_cv_hurd_version" >&6; } if test "x$libc_cv_hurd_version" != xok; then as_fn_error $? "Hurd headers not installed or too old" "$LINENO" 5 fi + +if test -n "$sysheaders"; then + CPPFLAGS=$OLD_CPPFLAGS +fi diff --git a/sysdeps/mach/hurd/configure.ac b/sysdeps/mach/hurd/configure.ac index b1f16a569e..af9a9ea052 100644 --- a/sysdeps/mach/hurd/configure.ac +++ b/sysdeps/mach/hurd/configure.ac @@ -3,6 +3,11 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. dnl We need this setting because of the need for PLT calls in ld.so. AC_DEFINE([NO_HIDDEN]) +if test -n "$sysheaders"; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $SYSINCLUDES" +fi + AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl AC_TRY_COMPILE(dnl [#include <hurd/version.h>], [ @@ -15,3 +20,7 @@ AC_TRY_COMPILE(dnl if test "x$libc_cv_hurd_version" != xok; then AC_MSG_ERROR(Hurd headers not installed or too old) fi + +if test -n "$sysheaders"; then + CPPFLAGS=$OLD_CPPFLAGS +fi |