From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Fri, 21 Aug 2020 07:05:41 +0000 Subject: [PATCH 24/35] always build libgcc_eh.a highly inspired by: http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch --- libgcc/Makefile.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 6c4dc79ab71..023cede18a7 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -960,8 +960,9 @@ ifneq ($(LIBUNWIND),) all: libunwind.a endif +all: libgcc_eh.a ifeq ($(enable_shared),yes) -all: libgcc_eh.a libgcc_s$(SHLIB_EXT) +all: libgcc_s$(SHLIB_EXT) ifneq ($(LIBUNWIND),) all: libunwind$(SHLIB_EXT) libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT) @@ -1163,10 +1164,6 @@ install-libunwind: install-shared: $(mkinstalldirs) $(DESTDIR)$(inst_libdir) - $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/ - chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a - $(subst @multilib_dir@,$(MULTIDIR),$(subst \ @shlib_base_name@,libgcc_s,$(subst \ @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL)))) @@ -1183,6 +1180,10 @@ ifeq ($(enable_gcov),yes) $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a endif + $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/ + chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a + parts="$(INSTALL_PARTS)"; \ for file in $$parts; do \ rm -f $(DESTDIR)$(inst_libdir)/$$file; \ -- 2.41.0