Skip to content

Commit 2a89147

Browse files
committed
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: #457.
1 parent c39cf8f commit 2a89147

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ if USE_BUILTIN_HARFBUZZ
121121
LOCAL_HB_FLAGS = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
122122
LOCAL_HB_SOURCES = $(HARFBUZZ_SOURCES)
123123
if OS_WIN32
124-
LINKER = $(CXXLINK)
124+
LINKER = $(LINK) #$(CXXLINK)
125125
else
126126
LINKER = $(LINK)
127127
endif

Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ HARFBUZZ_SOURCES = \
831831
@USE_BUILTIN_HARFBUZZ_TRUE@LOCAL_HB_FLAGS = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
832832
@USE_BUILTIN_HARFBUZZ_TRUE@LOCAL_HB_SOURCES = $(HARFBUZZ_SOURCES)
833833
@OS_WIN32_FALSE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(LINK)
834-
@OS_WIN32_TRUE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(CXXLINK)
834+
@OS_WIN32_TRUE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(LINK) #$(CXXLINK)
835835
@USE_BUILTIN_HARFBUZZ_FALSE@LINKER = $(LINK)
836836
libSDL2_ttf_la_LDFLAGS = \
837837
-no-undefined \

ltmain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4785,7 +4785,7 @@ func_mode_link ()
47854785
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
47864786
# @file GCC response files
47874787
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
4788-
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
4788+
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|-static-*|@*)
47894789
func_quote_for_eval "$arg"
47904790
arg="$func_quote_for_eval_result"
47914791
func_append compile_command " $arg"

0 commit comments

Comments
 (0)