From patchwork Mon Dec 19 01:36:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 62124 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 61F4C3894A28 for ; Mon, 19 Dec 2022 01:36:49 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 8F05738941BB for ; Mon, 19 Dec 2022 01:36:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F05738941BB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id D27CD20187; Mon, 19 Dec 2022 02:36:26 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7OfQop4h-lGp; Mon, 19 Dec 2022 02:36:26 +0100 (CET) Received: from begin (lfbn-bor-1-376-208.w109-215.abo.wanadoo.fr [109.215.91.208]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id BA5C820185; Mon, 19 Dec 2022 02:36:26 +0100 (CET) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1p754s-00EZ4Y-1T; Mon, 19 Dec 2022 02:36:26 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] mach: Fix passing -ffreestanding when checking for gnumach headers Date: Mon, 19 Dec 2022 02:36:26 +0100 Message-Id: <20221219013626.3471403-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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. --- 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