48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 9e9a27707e9342f2002f7673421d4abbafc883ec Mon Sep 17 00:00:00 2001
|
|
From: "H.J. Lu" <hjl.tools@gmail.com>
|
|
Date: Wed, 19 Jun 2024 14:24:35 -0700
|
|
Subject: [PATCH] ld: Remove JANSSON_LIBS from ld_new_DEPENDENCIES
|
|
|
|
Remove JANSSON_LIBS from ld_new_DEPENDENCIES since ld_new_DEPENDENCIES
|
|
should only contain binutils dependencies.
|
|
|
|
PR ld/31909
|
|
* Makefile.am (ld_new_DEPENDENCIES): Remove JANSSON_LIBS.
|
|
* Makefile.in: Regenerated.
|
|
|
|
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
|
|
---
|
|
ld/Makefile.am | 2 +-
|
|
ld/Makefile.in | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ld/Makefile.am b/ld/Makefile.am
|
|
index f9ee05b1400..6a9833e5775 100644
|
|
--- a/ld/Makefile.am
|
|
+++ b/ld/Makefile.am
|
|
@@ -658,7 +658,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
|
|
ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c plugin.c \
|
|
ldbuildid.c
|
|
ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \
|
|
- $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) $(JANSSON_LIBS)
|
|
+ $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
|
|
ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
|
|
$(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
|
|
|
|
diff --git a/ld/Makefile.in b/ld/Makefile.in
|
|
index 8350f00a521..8639e782cdf 100644
|
|
--- a/ld/Makefile.in
|
|
+++ b/ld/Makefile.in
|
|
@@ -1036,7 +1036,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
|
|
ldbuildid.c
|
|
|
|
ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \
|
|
- $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) $(JANSSON_LIBS)
|
|
+ $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
|
|
|
|
ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
|
|
$(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
|
|
--
|
|
2.33.0
|
|
|