--- a/make/lib/Awt2dLibraries.gmk	Tue May 29 11:22:21 2018 -0700
+++ b/make/lib/Awt2dLibraries.gmk	Wed May 30 08:19:59 2018 +0200
@@ -269,6 +269,7 @@
   ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
     LIBAWT_XAWT_DIRS := \
+        $(wildcard $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt_xawt) \
         $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
         $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
         $(TOPDIR)/src/java.desktop/share/native/common/awt/utility \
@@ -329,7 +330,7 @@
       BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
       # initializing a declared 'extern'
       BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
-   endif
+    endif
 
     $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
         NAME := awt_xawt, \