From 2a891473eaf05ba1707a4b7913e6c4db7de7458a Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 2 Jan 2025 18:28:28 +0300
Subject: [PATCH] autotools: link with gcc instead of g++ when targeting
windows, too
we used to link with mingw-g++ because that's what harfbuzz Makefile.am
does. I don't know why they do that. I don't know what their cmake'ry or
meson'ry do, either. But this does seem to work and eliminates linkage
to libgcc_s.
Reference issue: https://github.com/libsdl-org/SDL_ttf/issues/457.
---
Makefile.am | 2 +-
Makefile.in | 2 +-
ltmain.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f20a56c4..abaa70fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ if USE_BUILTIN_HARFBUZZ
LOCAL_HB_FLAGS = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
LOCAL_HB_SOURCES = $(HARFBUZZ_SOURCES)
if OS_WIN32
-LINKER = $(CXXLINK)
+LINKER = $(LINK) #$(CXXLINK)
else
LINKER = $(LINK)
endif
diff --git a/Makefile.in b/Makefile.in
index 14ef0b11..de98f631 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -831,7 +831,7 @@ HARFBUZZ_SOURCES = \
@USE_BUILTIN_HARFBUZZ_TRUE@LOCAL_HB_FLAGS = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
@USE_BUILTIN_HARFBUZZ_TRUE@LOCAL_HB_SOURCES = $(HARFBUZZ_SOURCES)
@OS_WIN32_FALSE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(LINK)
-@OS_WIN32_TRUE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(CXXLINK)
+@OS_WIN32_TRUE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(LINK) #$(CXXLINK)
@USE_BUILTIN_HARFBUZZ_FALSE@LINKER = $(LINK)
libSDL2_ttf_la_LDFLAGS = \
-no-undefined \
diff --git a/ltmain.sh b/ltmain.sh
index 67d2fd74..5c26903b 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -4785,7 +4785,7 @@ func_mode_link ()
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|-static-*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"