aboutsummaryrefslogtreecommitdiff
path: root/gdbserver
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-08 18:04:28 -0400
committerMike Frysinger <vapier@gentoo.org>2021-06-14 18:01:20 -0400
commit483ab96a1bd6df30035dc2ae1a90b1b59c54ef75 (patch)
tree6caabc894a85765a3cd961a28fc0c635aa462e05 /gdbserver
parent09db4332c6017ab57cd136788c48e5a81e3b9399 (diff)
downloadgdb-483ab96a1bd6df30035dc2ae1a90b1b59c54ef75.zip
gdb-483ab96a1bd6df30035dc2ae1a90b1b59c54ef75.tar.gz
gdb-483ab96a1bd6df30035dc2ae1a90b1b59c54ef75.tar.bz2
gnulib: define the path to gnulib's parent dir
The current setting assumes that gnulib is only used by dirs immediately under the source root. Trying to build it two or more levels deep fails. Switch GNULIB_BUILDDIR to a relative GNULIB_PARENT_DIR so that it can be used to construct both the build & source paths.
Diffstat (limited to 'gdbserver')
-rw-r--r--gdbserver/ChangeLog8
-rw-r--r--gdbserver/Makefile.in4
2 files changed, 8 insertions, 4 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index f8d7fd6..9f4fcf8 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-14 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (GNULIB_BUILDDIR): Rename to ...
+ (GNULIB_PARENT_DIR): ... this. Remove "gnulib" from value.
+
2021-05-27 Simon Marchi <simon.marchi@polymtl.ca>
* Fix some indentation mistakes throughout.
@@ -5712,8 +5717,7 @@
* gdbreplay.c: Fix common/ includes.
* fork-child.c: Fix common/ includes.
* event-loop.c: Fix common/ includes.
- * ax.c:
- (enum gdb_agent_op): Fix common/ includes.
+ * ax.c (enum gdb_agent_op): Fix common/ includes.
2019-01-21 Tom Tromey <tom@tromey.com>
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index f7ade7d..12e9b27 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -122,8 +122,8 @@ ustlibs = @ustlibs@
ustinc = @ustinc@
# gnulib
-GNULIB_BUILDDIR = ../gnulib
-include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc
+GNULIB_PARENT_DIR = ..
+include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
# Where is the INTL library? Typically in ../intl.
INTL = @LIBINTL@