From patchwork Thu Jun 17 05:44:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1493186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=IidrGq2I; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G59xs6xMtz9sVp for ; Thu, 17 Jun 2021 15:45:21 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 87BAA383A805 for ; Thu, 17 Jun 2021 05:45:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87BAA383A805 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623908717; bh=Iz9eFniWcg4L4zg32sI+tpSSnn1uCdAt7qHkjs3igp0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=IidrGq2I4ynIXSzPRk8f1kG4yAPQbqd+4Db+voquW++fgxBKAnFWpo8nlAvO1gypX I7cCuyNhC2jjrbwPmXKXTKVR+2PzYbEjt+VpM/wL8zn9P3W3HIbnNJiWoNtAhlVfTK 0J/z7PUtYbX8/Byx3/+ljmmB5t6oYM4RxCtQBvdI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hedgehog.birch.relay.mailchannels.net (hedgehog.birch.relay.mailchannels.net [23.83.209.81]) by sourceware.org (Postfix) with ESMTPS id E4D083857809 for ; Thu, 17 Jun 2021 05:45:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E4D083857809 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 313DE7E23B7; Thu, 17 Jun 2021 05:45:00 +0000 (UTC) Received: from pdx1-sub0-mail-a82.g.dreamhost.com (100-101-162-59.trex.outbound.svc.cluster.local [100.101.162.59]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CC34A7E24B2; Thu, 17 Jun 2021 05:44:59 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a82.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.101.162.59 (trex/6.3.1); Thu, 17 Jun 2021 05:45:00 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Trail-Shrill: 4d84e3ec24ce6943_1623908700067_314562952 X-MC-Loop-Signature: 1623908700067:765267821 X-MC-Ingress-Time: 1623908700066 Received: from pdx1-sub0-mail-a82.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a82.g.dreamhost.com (Postfix) with ESMTP id 7E18989378; Wed, 16 Jun 2021 22:44:59 -0700 (PDT) Received: from rhbox.intra.reserved-bit.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a82.g.dreamhost.com (Postfix) with ESMTPSA id DD0E688DB9; Wed, 16 Jun 2021 22:44:57 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a82 To: libc-alpha@sourceware.org Subject: [PATCH] Makeconfig: Fix time64-compat.mk target Date: Thu, 17 Jun 2021 11:14:45 +0530 Message-Id: <20210617054445.1981632-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3494.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , X-Patchwork-Original-From: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" The time64-compat.i needed for the time64-compat.mk Makeconfig include ends up trying to include libc-modules.h, which is not generated until later. This results in an error during build which is not noticed because it somehow does not terminate the build. Exclude the modules cppflags from the pre-processing command and fix up the time64-compat.mk target so that the build runs without issues. --- Makeconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makeconfig b/Makeconfig index b6357d0b19..6482a43025 100644 --- a/Makeconfig +++ b/Makeconfig @@ -970,7 +970,7 @@ module-cppflags-real = -include $(common-objpfx)libc-modules.h \ # facility. In fact, shlib-versions should not use it because that will # create a circular dependency as libc-modules.h is generated from # shlib-versions. -module-cppflags = $(if $(filter %.v.i,$(@F)),,$(module-cppflags-real)) +module-cppflags = $(if $(filter %.mk.i %.v.i,$(@F)),,$(module-cppflags-real)) # These are the variables that the implicit compilation rules use. # Note that we can't use -std=* in CPPFLAGS, because it overrides @@ -1239,11 +1239,11 @@ endif # $(build-shared) = yes -include $(common-objpfx)time64-compat.mk postclean-generated += time64-compat.mk -$(common-objpfx)time64-compat.mk: $(sysd-versions-force) \ - $(common-objpfx)time64-compat.i +$(common-objpfx)time64-compat.mk: $(common-objpfx)time64-compat.mk.i \ + $(sysd-versions-force) sed '/^[ ]*#/d;/^[ ]*$$/d' $< > $@T mv -f $@T $@ -$(common-objpfx)time64-compat.i: $(..)Makeconfig +$(common-objpfx)time64-compat.mk.i: $(..)Makeconfig printf "#include \n#ifdef TIME64_NON_DEFAULT\nhave-time64-compat = yes\n#endif" \ | $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - > $@T mv -f $@T $@