# HG changeset patch
# User tbell
# Date 1254948791 25200
# Node ID 540aba73fd312773d2aa75f48e187f59a75860e0
# Parent  cf907ac8ca4c17f3206274cb747838ce4d6fcf46
6888888: new javah throws NullPointerException when building in jdk/make/java/nio
Summary: Use the bootstrap javah during the build until bug-ID 6889255 is fixed
Reviewed-by: jjg

diff -r cf907ac8ca4c -r 540aba73fd31 jdk/make/common/shared/Defs-java.gmk
--- a/jdk/make/common/shared/Defs-java.gmk	Wed Oct 07 17:23:02 2009 +0100
+++ b/jdk/make/common/shared/Defs-java.gmk	Wed Oct 07 13:53:11 2009 -0700
@@ -165,6 +165,11 @@
   JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
 endif
 
+#always use the bootstrap javah until bug-ID 6889255 is fixed.  These
+#five lines should be removed as part of that fix:
+JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
+		  $(JAVAHFLAGS)
+
 # Override of what javac to use (see deploy workspace)
 ifdef JAVAC
   JAVAC_CMD     = $(JAVAC)