$NetBSD: patch-jdk_make_java_nio_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Ensure we pick up the main flags.

--- jdk/make/java/nio/Makefile.orig	2014-01-25 07:34:08.000000000 +0000
+++ jdk/make/java/nio/Makefile
@@ -34,6 +34,9 @@ PRODUCT = java
 OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
 include $(BUILDDIR)/common/Defs.gmk
 
+LDDFLAGS += $(LDFLAGS)
+CPPFLAGS += $(CFLAGS)
+
 NIO_SRC = $(SHARE_SRC)/classes/java/nio
 NIO_GEN = $(GENSRCDIR)/java/nio
 
@@ -986,19 +989,15 @@ GENSOR_EXE = $(TEMPDIR)/genSocketOptionR
 SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
 	$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') 
 
-$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
-	$(install-file)
-
-ifeq ($(PLATFORM), macosx)
-  NIO_CC=$(HOST_CC)
+ifeq ($(PLATFORM), netbsd)
+  NIO_CC?=$(HOST_CC)
 else
-  NIO_CC=$(CC)
+  NIO_CC?=$(CC)
 endif
 
-$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
-	$(prep-target)
-	($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
-	   -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
+$(GENSOR_EXE) : $(GENSOR_SRC)
+	($(NIO_CC) \
+	   -o $(GENSOR_EXE) $(GENSOR_SRC))
 
 ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
 $(SCH_GEN)/SocketOptionRegistry.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/ch/SocketOptionRegistry-$(PLATFORM)-$(ARCH).java
@@ -1033,7 +1032,7 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $
 
 $(GENUC_EXE) : $(GENUC_SRC)
 	$(prep-target)
-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
+	$(NIO_CC) -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
@@ -1055,7 +1054,7 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $
 
 $(GENSC_EXE) : $(GENSC_SRC)
 	$(prep-target)
-	$(NIO_CC) $(CPPFLAGS) -o $@ $(GENSC_SRC)
+	$(NIO_CC) -o $@ $(GENSC_SRC)
 
 ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
 $(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java
