aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-02-06 19:24:29 -0500
committerMike Frysinger <vapier@gentoo.org>2021-02-13 00:15:11 -0500
commitadeab0c5b33fd5f4959fa9a079a5b558f0088ba3 (patch)
treef0e1e771e70ec144700d8ff292154234e2b4bb5a /gdb
parentceda7cf7f715ff62bfd9caeaa3f1b1ef9fdd4ecf (diff)
downloadgdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.zip
gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.tar.gz
gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.tar.bz2
config/debuginfod: do not include pkg.m4 directly
Any code using AC_DEBUGINFOD from this dir is using -I../config when running aclocal, so an explicit include on pkg.m4 is unnecessary: aclocal will find the pkg.m4 in this dir just as easily. This is seen in the only two dirs that use AC_DEBUGINFOD (binutils & gdb) as their aclocal.m4 already has m4_include on config m4 files. The include as written only works if aclocal is run on a dir that is at the same level of config/. Any other depth will fail. ./ |-- config/ |-- binutils/ # works |-- gdb/ # works `-- sim/ # works `-- <port>/ # fails It fails even if AC_DEBUGINFOD itself isn't used: sim/bfin/ $ aclocal -I../../config aclocal-1.15: error: ../../config/debuginfod.m4:8: file '../config/pkg.m4' does not exist
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/aclocal.m41
2 files changed, 5 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e79b953..204bb40 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-13 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+
2021-02-12 Tom de Vries <tdevries@suse.de>
PR threads/26228
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 110b416..cbea739 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -199,4 +199,5 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+m4_include([../config/pkg.m4])
m4_include([acinclude.m4])