aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2023-03-28 08:39:01 +0000
committerWerner Koch <[email protected]>2023-03-28 08:39:35 +0000
commit04f1d9649cfb9163907fe97d20821ddd1be44f82 (patch)
tree6641c95ac9216dc5c5b3550d9689ec056980df3d
parentbuild: Remove obsolete --with-regex from autogen.rc (diff)
downloadgnupg-04f1d9649cfb9163907fe97d20821ddd1be44f82.tar.gz
gnupg-04f1d9649cfb9163907fe97d20821ddd1be44f82.zip
speedo: Fix regression due to switching from gcc 8.3 to 10.2
* build-aux/speedo.mk (speedo_pkg_zlib_make_args): Use -static-libgcc.
-rw-r--r--build-aux/speedo.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index d010d6c3e..26025b7f5 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -688,9 +688,13 @@ speedo_pkg_w64_gpgex_configure = \
# External packages
#
+# gcc 10.2 takes __udivdi3 from the exception handler DLL and thus
+# requires it. This is a regression from gcc 8.3 and earlier. To fix
+# this we need to pass -static-libgcc.
ifeq ($(TARGETOS),w32)
speedo_pkg_zlib_make_args = \
- -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
+ -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a \
+ LDFLAGS=-static-libgcc
speedo_pkg_zlib_make_args_inst = \
-fwin32/Makefile.gcc \