--- a/jdk/makefiles/Tools.gmk	Thu Oct 24 20:46:23 2013 -0400
+++ b/jdk/makefiles/Tools.gmk	Thu Oct 24 20:47:41 2013 -0400
@@ -32,7 +32,7 @@
     $(JDK_TOPDIR)/makefiles/sun/osxapp \
     $(JDK_TOPDIR)/make/tools/swing-beans
 
-ifneq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
   TOOLS_SRC += $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
 endif