changeset 14776:5543226e24d2

8144616: Problem building OpenJDK/harfbuzz on jprt Reviewed-by: serb, vadim
author prr
date Thu, 03 Dec 2015 11:53:00 -0800
parents 9f7e8e4f8cc9
children 8ef2bf79539c d758cae77635
files make/lib/Awt2dLibraries.gmk
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/Awt2dLibraries.gmk	Thu Dec 03 14:01:33 2015 +0530
+++ b/make/lib/Awt2dLibraries.gmk	Thu Dec 03 11:53:00 2015 -0800
@@ -622,9 +622,8 @@
 ifneq ($(OPENJDK_TARGET_OS), macosx)
   LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
 endif
-ifndef OPENJDK
-  LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
-endif
+# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
+LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
 
 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)