aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2021-05-11 11:06:53 +0100
committerNick Clifton <nickc@redhat.com>2021-05-11 11:06:53 +0100
commit22604fe675b25b3ffca56e44f2c0ff378e5c6104 (patch)
tree61019592fe39df7b4dcd9181ecea3d0e10ef2bcb
parentcfe7a19169f54ce3a007f850b7adccbaec62d00a (diff)
downloadfsf-binutils-gdb-22604fe675b25b3ffca56e44f2c0ff378e5c6104.zip
fsf-binutils-gdb-22604fe675b25b3ffca56e44f2c0ff378e5c6104.tar.gz
fsf-binutils-gdb-22604fe675b25b3ffca56e44f2c0ff378e5c6104.tar.bz2
Prevent libdel.dll.a from being installed on Windows based systems.
PR 27113 * Makefile.am (install-data-local): Also delete libdep.dll.a if it is present. * Makefile.in: Regenerate.
-rw-r--r--ld/ChangeLog7
-rw-r--r--ld/Makefile.am1
-rw-r--r--ld/Makefile.in1
3 files changed, 9 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index e92638a..68328a8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2021-05-11 Nick Clifton <nickc@redhat.com>
+
+ PR 27113
+ * Makefile.am (install-data-local): Also delete libdep.dll.a if it
+ is present.
+ * Makefile.in: Regenerate.
+
2021-05-10 Dimitar Dimitrov <dimitar@dinux.eu>
* testsuite/ld-elf/group8a.d: Remove pru from XFAIL list.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 0314a58..f8e9932 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1081,6 +1081,7 @@ install-data-local: install-bfdpluginLTLIBRARIES
$(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
done
rm -f $(DESTDIR)$(bfdplugindir)/libdep.la
+ rm -f $(DESTDIR)$(bfdplugindir)/libdep.dll.a
# Stuff that should be included in a distribution. The diststuff
# target is run by the taz target in ../Makefile.in.
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 211e620..ef2e99e 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2680,6 +2680,7 @@ install-data-local: install-bfdpluginLTLIBRARIES
$(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
done
rm -f $(DESTDIR)$(bfdplugindir)/libdep.la
+ rm -f $(DESTDIR)$(bfdplugindir)/libdep.dll.a
diststuff: info $(EXTRA_DIST)
# Both info (ld.info) and ld.1 depend on configdoc.texi.