[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/Makefile.am |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 20a840c7cd08069720050782b4533cde505df09a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 24 20:23:00 2012 -0400

    Use a C++ linker on Windows
    
    On Windows we don't care whether or not we link to libstdc++.
    Seems to fix build with mingw32 on msys, as reported by Werner.

diff --git a/src/Makefile.am b/src/Makefile.am
index 7401df9..823b9e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,10 +179,12 @@ DIST_SUBDIRS += hb-icu-le
 if OS_WIN32
 export_symbols = -export-symbols harfbuzz.def
 harfbuzz_def_dependency = harfbuzz.def
-endif
-
+libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
+else
 # Use a C linker, not C++; Don't link to libstdc++
 libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS)
+endif
+
 libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
 nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES)
 libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)