--- old/make/gensrc/Gensrc-java.desktop.gmk	2018-03-06 00:29:13.412363835 +0100
+++ new/make/gensrc/Gensrc-java.desktop.gmk	2018-03-06 00:29:13.184363836 +0100
@@ -30,10 +30,10 @@
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
+endif
 
-  ifneq ($(OPENJDK_TARGET_OS), macosx)
-    include GensrcX11Wrappers.gmk
-  endif
+ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris aix), )
+  include GensrcX11Wrappers.gmk
 endif
 
 include GensrcSwing.gmk