--- old/makefiles/Tools.gmk	2013-10-23 20:43:35.000000000 -0700
+++ new/makefiles/Tools.gmk	2013-10-23 20:43:35.000000000 -0700
@@ -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