From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id E80BE38F8798; Mon, 19 Dec 2022 01:36:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E80BE38F8798 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671413774; bh=If8rE6mzgpmXCNnVdJNPeC3Q6HlZv3HL4aVtATzz1vc=; h=From:To:Subject:Date:From; b=cEf97e0CwgV3AF1+82ooh8XwfHIfqd7XoXAQelCPvBAkBDyqU3jVQD10xDX+XjeFz OTtKOdO/w27b9dC9Nu9W8Llfw36zlwqFDi1C8bhWdD6wjslVZ5nJsrDoHxGbSWJJTs zYaKZVbBVR++JXH/cQrz8UpwlIgGiitqHkvWT9oA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] mach: Fix passing -ffreestanding when checking for gnumach headers X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 8b8c768e3c701ed1993789bb46acb8a12c7a93df X-Git-Newrev: 7685630b98ca2a3f5de86eadf130993e6cf998a0 Message-Id: <20221219013614.E80BE38F8798@sourceware.org> Date: Mon, 19 Dec 2022 01:36:14 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7685630b98ca2a3f5de86eadf130993e6cf998a0 commit 7685630b98ca2a3f5de86eadf130993e6cf998a0 Author: Samuel Thibault Date: Mon Dec 19 02:34:55 2022 +0100 mach: Fix passing -ffreestanding when checking for gnumach headers 8b8c768e3c70 ("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. Diff: --- sysdeps/mach/configure | 9 +++------ sysdeps/mach/configure.ac | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index 36f556a663..ba6371cd3f 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -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 diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac index 5816c3d4ad..900e5445c5 100644 --- a/sysdeps/mach/configure.ac +++ b/sysdeps/mach/configure.ac @@ -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