From: Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] sim: switch common srcdir to abs_srcdir
Date: Tue, 22 Jun 2021 22:59:52 -0400 [thread overview]
Message-ID: <20210623025952.15180-1-vapier@gentoo.org> (raw)
In-Reply-To: <6d81e053-3470-e106-9556-e20e2610545a@polymtl.ca>
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
}' \
<Make-common.sim >$1/Makesim1.tmp
--
2.31.1
next prev parent reply other threads:[~2021-06-23 3:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 5:55 [PATCH 1/5] sim: hw: rework configure option & device selection Mike Frysinger via Gdb-patches
2021-06-20 5:55 ` [PATCH 2/5] sim: unify hardware settings Mike Frysinger via Gdb-patches
2021-06-20 5:55 ` [PATCH 3/5] sim: drop configure scripts for simple ports Mike Frysinger via Gdb-patches
2021-06-23 1:05 ` Simon Marchi via Gdb-patches
2021-06-23 2:09 ` Mike Frysinger via Gdb-patches
2021-06-23 2:59 ` Mike Frysinger via Gdb-patches [this message]
2021-06-23 13:01 ` [PATCH] sim: switch common srcdir to abs_srcdir Simon Marchi via Gdb-patches
2021-06-20 5:55 ` [PATCH 4/5] sim: rx: merge with common configure script Mike Frysinger via Gdb-patches
2021-06-20 5:55 ` [PATCH 5/5] sim: hw: move cfi & glue to common code Mike Frysinger via Gdb-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210623025952.15180-1-vapier@gentoo.org \
--to=gdb-patches@sourceware.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox