From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A095C433ED for ; Mon, 26 Apr 2021 09:54:35 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8676561103 for ; Mon, 26 Apr 2021 09:54:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8676561103 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.117535.223458 (Exim 4.92) (envelope-from ) id 1laxwW-0001hr-IQ; Mon, 26 Apr 2021 09:54:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 117535.223458; Mon, 26 Apr 2021 09:54:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1laxwW-0001hk-Ed; Mon, 26 Apr 2021 09:54:16 +0000 Received: by outflank-mailman (input) for mailman id 117535; Mon, 26 Apr 2021 09:54:15 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1laxwV-0001hf-HU for xen-devel@lists.xenproject.org; Mon, 26 Apr 2021 09:54:15 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5b5adb57-707f-4978-92bf-2b11decc674b; Mon, 26 Apr 2021 09:54:14 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id A7072ADA2; Mon, 26 Apr 2021 09:54:13 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5b5adb57-707f-4978-92bf-2b11decc674b X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1619430853; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ie/uZd0oRdkfScOgFpcaD7DCEzFZHlhzJX6XVwGYkWU=; b=FLIddvawrFUkLsy6lMVKCohXAVrQ7BTcgZ9ZaGMykl8XPSOmxu3o4qjiQUR0GOdM3svmk4 9eaYUiMI40fYGTw4xahEBqKD+33ezNFwMss+8JfzpSzC54mPLBIUZIx5oyuWxJHiWbaEh0 9xZ1KsyO7Vt0Pf+HElwBzBojcJxsv3I= To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= From: Jan Beulich Subject: [PATCH] x86: fix build race when generating temporary object files (take 2) Message-ID: Date: Mon, 26 Apr 2021 11:54:13 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit The original commit wasn't quite sufficient: Emptying DEPS is helpful only when nothing will get added to it subsequently. xen/Rules.mk will, after including the local Makefile, amend DEPS by dependencies for objects living in sub-directories though. For the purpose of suppressing dependencies of the makefiles on the .*.d2 files (and thus to avoid their re-generation) it is, however, not necessary at all to play with DEPS. Instead we can override DEPS_INCLUDE (which generally is a late- expansion variable). Fixes: 761bb575ce97 ("x86: fix build race when generating temporary object files") Signed-off-by: Jan Beulich --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -314,5 +314,5 @@ clean:: # Suppress loading of DEPS files for internal, temporary target files. This # then also suppresses re-generation of the respective .*.d2 files. ifeq ($(filter-out .xen%.o,$(notdir $(MAKECMDGOALS))),) -DEPS:= +DEPS_INCLUDE:= endif