From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ojsRGNej0mBccAAAWB0awg (envelope-from ) for ; Tue, 22 Jun 2021 23:00:39 -0400 Received: by simark.ca (Postfix, from userid 112) id 532DB1F1F2; Tue, 22 Jun 2021 23:00:39 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.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 E38B11E01F for ; Tue, 22 Jun 2021 23:00:35 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3A307395C809 for ; Wed, 23 Jun 2021 03:00:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A307395C809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624417235; bh=/HF2eoyO9vSIErYnRADqFrVpU1MZj9UakZe+fjkqX54=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=FjUbV7OxIixqky+Kkx3xAeD5NpAglh8r0+BMk0rT/2VLFNnfEmr1/6HXl55dY8MT7 3TScpTnC+Wz1gPLZoCYyMZnHV27HGg9VgQbyFJBtXEJURvZbsJYCqdmmW7j5Wm2YYd ICgiGHpRlHoujoorBDq87aPfkd/kWTbvPYej7rGk= Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id B822E3857435 for ; Wed, 23 Jun 2021 03:00:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B822E3857435 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 96D24335C9F for ; Wed, 23 Jun 2021 03:00:12 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: switch common srcdir to abs_srcdir Date: Tue, 22 Jun 2021 22:59:52 -0400 Message-Id: <20210623025952.15180-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <6d81e053-3470-e106-9556-e20e2610545a@polymtl.ca> References: <6d81e053-3470-e106-9556-e20e2610545a@polymtl.ca> 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" We rewrite srcdir in subdir Makefiles that we generate from the common parent dir since it points to the parent dir. Since @srcdir@ can be a variety of formats (relative & absolute), switch to @abs_srcdir@ which is a lot easier to adjust. Our use of srcdir in here should handle it. --- sim/common/Make-common.in | 2 +- sim/configure | 36 ++++++++++++++++++------------------ sim/configure.ac | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 4bf1e2e21e27..c203b4e1c7bf 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -34,7 +34,7 @@ ## COMMON_PRE_CONFIG_FRAG -srcdir = @srcdir@ +srcdir = @abs_srcdir@ VPATH = $(srcdir):$(srccom) srccom = $(srcdir)/../common srcroot = $(srcdir)/../.. diff --git a/sim/configure.ac b/sim/configure.ac index e227f112d8b9..3632b559bf0f 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -69,7 +69,7 @@ m4_define([SIM_BUILD_TARGET], [dnl AC_CONFIG_COMMANDS([$1/Makefile], [sed -n \ -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir / { s:= := ../:; s:$:/$1:; } + /^srcdir = / s:$:/$1: p }' \ $1/Makesim1.tmp -- 2.31.1