*** old/make/java/nio/Makefile	Thu Jun 16 20:10:57 2011
--- new/make/java/nio/Makefile	Thu Jun 16 20:10:55 2011

*** 818,835 ****
--- 818,840 ----
  $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
          $(install-file)
  
  $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
          $(prep-target)
-         ($(CD) $(TEMPDIR); $(HOST_CC) $(CPPFLAGS) $(LDDFLAGS) \
             -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
  
+ ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
+ $(SCH_GEN)/SocketOptionRegistry.java:
+         $(prep-target)
+         $(CP) $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/ch/SocketOptionRegistry-$(PLATFORM)-$(ARCH).java $@
+ else 
  $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
          $(prep-target)
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
          $(GENSOR_EXE) >> $@
  
+ endif
  #
  # Generated sun.nio.cs SingleByte classes
  #
  GENCSSRC = $(BUILDDIR)/tools/CharsetMapping
  CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar

*** 849,864 ****
--- 854,875 ----
  GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
          $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
  $(GENUC_EXE) : $(GENUC_SRC)
          $(prep-target)
-         $(HOST_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
  
+ ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
+ $(SFS_GEN)/UnixConstants.java:
+         $(prep-target)
+         $(CP) $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java $@
+ else
  $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
          $(prep-target)
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
          $(GENUC_EXE) >> $@
+ endif
  
  GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
  
  GENSC_EXE = $(TEMPDIR)/genSolarisConstants
  

*** 865,877 ****
--- 876,894 ----
  GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
          $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
  
  $(GENSC_EXE) : $(GENSC_SRC)
          $(prep-target)
-         $(HOST_CC) $(CPPFLAGS) -o $@ $(GENSC_SRC)
  
+ ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
+ $(SFS_GEN)/SolarisConstants.java:
+         $(prep-target)
+         $(CP) $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java $@
+ else
  $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
          $(prep-target)
          NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
          $(GENSC_EXE) >> $@
+ endif
  
  .PHONY: sources