From 7ba0ab566d76ee56f183f9e3eb1e211be1cd8d8e Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 3 Jan 2025 17:50:00 +0300
Subject: [PATCH] autotools: Eliminate libgcc*.dll dependency in mingw builds.
(cherry picked from commit 4cbdd6de7d3f06518ab5d037eda853ff91a28116)
---
configure | 3 ++-
configure.ac | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 905a7666..ddf9d62a 100755
--- a/configure
+++ b/configure
@@ -17528,6 +17528,8 @@ case "$host" in
fi
use_version_rc=true
LT_EXTRA="-Wl,version.o"
+ # Eliminate libgcc*.dll dependency
+ CFLAGS="$CFLAGS -static-libgcc"
;;
*-*-os2*)
# disable static builds on os/2
@@ -19961,7 +19963,6 @@ printf "%s\n" "#define ALIGNOF_STRUCT_CHAR__ $ac_cv_alignof_struct_char__" >>con
case "$host" in
*-*-mingw*) hb_os_win32=yes
CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++"
- CFLAGS="$CFLAGS -static-libgcc"
# for uniscribe support:
TTF_LIBS="$TTF_LIBS -lusp10 -lgdi32 -lrpcrt4"
PC_LIBS="$PC_LIBS -lusp10 -lgdi32 -lrpcrt4"
diff --git a/configure.ac b/configure.ac
index 5eaf5614..09446d61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,8 @@ case "$host" in
fi
use_version_rc=true
LT_EXTRA="-Wl,version.o"
+ # Eliminate libgcc*.dll dependency
+ CFLAGS="$CFLAGS -static-libgcc"
;;
*-*-os2*)
# disable static builds on os/2
@@ -241,7 +243,6 @@ if test x$enable_harfbuzz = xyes; then
case "$host" in
*-*-mingw*) hb_os_win32=yes
CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++"
- CFLAGS="$CFLAGS -static-libgcc"
# for uniscribe support:
TTF_LIBS="$TTF_LIBS -lusp10 -lgdi32 -lrpcrt4"
PC_LIBS="$PC_LIBS -lusp10 -lgdi32 -lrpcrt4"