[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 test/api/Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 33231a855f0e3d2a14e5e2fcb921c6fc773ae6cf
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 28 11:06:49 2018 -0400

    Fix pthread fail for real
    
    Using a hack...

diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 20057aa2..02e87803 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -81,7 +81,9 @@ if HAVE_FREETYPE
 TEST_PROGS += test-multithread
 test_multithread_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(FREETYPE_CFLAGS)
 test_multithread_LDADD = $(LDADD) $(PTHREAD_LIBS) $(FREETYPE_LIBS)
-test_multithread_LINK = $(LINK) $(test_multithread_LDADD)
+# The auto-generated link rule somehow includes CFLAGS as well.  Without
+# it, pthread link fails, because, who knows why, $PTHREAD_LIBS is empty.
+test_multithread_LINK = $(LINK) $(PTHREAD_CFLAGS)
 endif
 endif