aboutsummaryrefslogtreecommitdiff
path: root/binutils
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 /binutils
parentceda7cf7f715ff62bfd9caeaa3f1b1ef9fdd4ecf (diff)
downloadfsf-binutils-gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.zip
fsf-binutils-gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.tar.gz
fsf-binutils-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 'binutils')
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/aclocal.m41
2 files changed, 5 insertions, 0 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a717099..5b16bb2 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-13 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+
2021-02-12 Nick Clifton <nickc@redhat.com>
* configure.ac (follow-debug-links): Add option to enable or
diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
index 8eca8cf..e6b490a 100644
--- a/binutils/aclocal.m4
+++ b/binutils/aclocal.m4
@@ -1201,6 +1201,7 @@ m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.m4])
m4_include([../config/nls.m4])
m4_include([../config/override.m4])
+m4_include([../config/pkg.m4])
m4_include([../config/plugins.m4])
m4_include([../config/po.m4])
m4_include([../config/progtest.m4])