--- a/make/lib/Awt2dLibraries.gmk Wed Oct 25 12:41:24 2017 -0700
+++ b/make/lib/Awt2dLibraries.gmk Wed Oct 25 13:11:07 2017 -0700
@@ -317,6 +317,7 @@
LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
+ $(FONTCONFIG_CFLAGS) \
$(CUPS_CFLAGS)
ifeq ($(OPENJDK_TARGET_OS), solaris)
@@ -555,6 +556,7 @@
-DHEADLESS=true \
-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
$(CUPS_CFLAGS) \
+ $(FONTCONFIG_CFLAGS) \
$(X_CFLAGS) \
$(LIBAWT_HEADLESS_CFLAGS), \
DISABLED_WARNINGS_xlc := 1506-356, \