From e78463211e7d85f237bd55afab7e8e5dae42346c Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 14 Jan 2013 00:27:21 -0600 Subject: [PATCH] Fix linking with non-gcc compilers --- configure.ac | 2 ++ src/Makefile.am | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index afb0c5d..e95e48f 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,8 @@ if test "x$GCC" = "xyes"; then esac fi +AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes") + hb_os_win32=no AC_MSG_CHECKING([for native Win32]) case "$host" in diff --git a/src/Makefile.am b/src/Makefile.am index 558ce08..d72aa07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -198,8 +198,12 @@ else if HAVE_ICU libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) else -# Use a C linker, not C++; Don't link to libstdc++ +# Use a C linker for GCC, not C++; Don't link to libstdc++ +if HAVE_GCC libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) +else +libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +endif endif endif -- 2.7.4