8144616: Problem building OpenJDK/harfbuzz on jprt

Reviewed-by: serb, vadim
This commit is contained in:
Phil Race 2015-12-03 11:53:00 -08:00
parent 034df88671
commit 9e7c592717

View File

@ -622,9 +622,8 @@ endif
ifneq ($(OPENJDK_TARGET_OS), macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
endif endif
ifndef OPENJDK # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
endif
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)