  #
  # Generated sun.nio.cs SingleByte classes
  #
-@@ -863,7 +859,7 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
- 
- $(GENUC_EXE) : $(GENUC_SRC)
- 	$(prep-target)
--	$(CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
-+	$(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENUC_SRC)
- 
- ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
- $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
-@@ -873,12 +869,8 @@ else
+@@ -973,12 +969,8 @@
  $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
  	$(prep-target)
  	NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@

-endif
 
 .PHONY: sources 
--- openjdk/jdk/make/sun/Makefile.khem	2012-08-10 19:32:40.695550897 -0700
+++ openjdk/jdk/make/sun/Makefile	2012-08-10 19:33:39.195550853 -0700
@@ -55,7 +55,7 @@ ifneq ($(PLATFORM), windows)
     endif
   endif
   HEADLESS_SUBDIR = headless

+  XAWT_SUBDIR     =
 endif
 
 ifeq ($(PLATFORM), macosx)
@@ -87,7 +87,7 @@
 endif
 SUBDIRS_desktop    = audio $(RENDER_SUBDIR) image \
                      $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
-                     jawt font jpeg cmm $(DISPLAY_TOOLS) beans
+                     font jpeg cmm $(DISPLAY_TOOLS) beans
 SUBDIRS_management = management
