From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OEs3HTzA22AvOwAAWB0awg (envelope-from ) for ; Tue, 29 Jun 2021 20:52:12 -0400 Received: by simark.ca (Postfix, from userid 112) id 74D381E939; Tue, 29 Jun 2021 20:52:12 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 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 (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id C7F651E939 for ; Tue, 29 Jun 2021 20:52:11 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 89F77385DC31 for ; Wed, 30 Jun 2021 00:52:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89F77385DC31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625014331; bh=hzGCnRIgPZcjVeFVCi1Idfsw78PhDkqtz6qvbxJBDls=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=KwglsiqHITr5/8xLqMOMuvw5sgQr1SblRqM0VWH9nfprJvmQAbr5FpvjyiqtDe0xL 7SR51EZ0rJMKAT4zKVnJBALTdUKjpFDmgC3F6DJP88Eh2KXmesUqrtCy+YoHflHBBl F2zczvf4DSHfLjEVr0pCFLTVXV5Qkfskd6CU0IVU= Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 75244384F028 for ; Wed, 30 Jun 2021 00:51:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 75244384F028 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 69A70335D3E for ; Wed, 30 Jun 2021 00:51:27 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: fix arch Makefile regen when unified Date: Tue, 29 Jun 2021 20:51:25 -0400 Message-Id: <20210630005125.7075-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" The $(arch) variable is only setup for cgen ports, so calculate this value dynamically. We also need to generate multiple inputs in order to properly recreate the subdir Makefile, so list them all. --- sim/common/Make-common.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index c203b4e1c7bf..723bda589c9b 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -534,7 +534,8 @@ force: Makefile: Makefile.in $(srccom)/Make-common.in $(config.status) @SIM_COMMON_BUILD_FALSE@ CONFIG_HEADERS= $(SHELL) ./config.status -@SIM_COMMON_BUILD_TRUE@ cd .. && $(SHELL) ./config.status $(arch)/Makefile +@SIM_COMMON_BUILD_TRUE@ pwd=`pwd` && subdir=`basename "$$pwd"` && cd .. && \ +@SIM_COMMON_BUILD_TRUE@ $(SHELL) ./config.status Make-common.sim $$subdir/Makefile.sim $$subdir/Makefile @SIM_COMMON_BUILD_FALSE@config.status: configure @SIM_COMMON_BUILD_FALSE@ $(SHELL) ./config.status --recheck -- 2.31.1