f125901979
upstream commit:
1e550564a9
[ci:skip-build] Builds locally, no point to build on poor Gitlab CI
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From fd531b1754dfa64791342c8e76001a509b3646ca Mon Sep 17 00:00:00 2001
|
|
From: Ariadne Conill <ariadne@dereferenced.org>
|
|
Date: Fri, 21 Aug 2020 07:05:41 +0000
|
|
Subject: [PATCH] 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 851e7657d07..99ec513a1a6 100644
|
|
--- a/libgcc/Makefile.in
|
|
+++ b/libgcc/Makefile.in
|
|
@@ -956,8 +956,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)
|
|
@@ -1159,10 +1160,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))))
|
|
@@ -1179,6 +1176,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.33.1
|
|
|