AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 22:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mach: Fix passing -ffreestanding when checking for gnumach headers

Browse Source 
8b8c768e3c ("Force use of -ffreestanding when checking for gnumach
headers") was passing -ffreestanding to CFLAGS only, but headers checks are
performed with the preprocessor, so we rather need to pass it to CPPFLAGS.
This commit is contained in:
Samuel Thibault 2022-12-19 02:34:55 +01:00
parent 8b8c768e3c
commit 7685630b98
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysdeps/mach/configure vendored
View File

@ -127,14 +127,13 @@ fi
config_vars="$config_vars
MIG = $MIG"
OLD_CPPFLAGS=$CPPFLAGS
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
fi
### Sanity checks for Mach header installation
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -ffreestanding"
CPPFLAGS="$CPPFLAGS -ffreestanding"
ac_fn_c_check_header_preproc "$LINENO" "mach/mach_types.h" "ac_cv_header_mach_mach_types_h"
@ -527,6 +526,4 @@ if test $hurd_cv_mig_retcode = yes; then
fi
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi
CPPFLAGS=$OLD_CPPFLAGS

9
sysdeps/mach/configure.ac
View File

@ -6,14 +6,13 @@ if test "x$MIG" = xMISSING; then
fi
LIBC_CONFIG_VAR([MIG], [$MIG])
OLD_CPPFLAGS=$CPPFLAGS
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
fi
### Sanity checks for Mach header installation
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -ffreestanding"
CPPFLAGS="$CPPFLAGS -ffreestanding"
AC_CHECK_HEADER(mach/mach_types.h,,
[AC_MSG_ERROR([cannot find Mach headers])], -)
CFLAGS=$old_CFLAGS
@ -136,6 +135,4 @@ fi])
hurd_MIG_RETCODE
if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi
CPPFLAGS=$OLD_CPPFLAGS