diff options
| author | Werner Koch <wk@gnupg.org> | 2023-03-28 10:39:01 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2023-04-04 10:20:17 +0200 |
| commit | fcbb849c26e999db4922237492597f56edbcd39a (patch) | |
| tree | e2706475d8f780a514def456bd2f6ada2cd50600 | |
| parent | gpg: Set the default digest algo for S2K to SHA256. (diff) | |
| download | gnupg2-fcbb849c26e999db4922237492597f56edbcd39a.tar.xz gnupg2-fcbb849c26e999db4922237492597f56edbcd39a.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.
(cherry picked from commit 04f1d9649cfb9163907fe97d20821ddd1be44f82)
| -rw-r--r-- | build-aux/speedo.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 56e317275..f21f43731 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -699,9 +699,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 \ |