1.1 --- a/make/common/shared/Defs-java.gmk Fri Aug 13 11:38:10 2010 -0700
1.2 +++ b/make/common/shared/Defs-java.gmk Mon Aug 30 14:39:42 2010 -0700
1.3 @@ -42,7 +42,7 @@
1.4 endif
1.5
1.6 #
1.7 -# All java tools (javac, javah, and javadoc) run faster with certain java
1.8 +# All java tools (javac and javadoc) run faster with certain java
1.9 # options, this macro should be used with all these tools.
1.10 # In particular, the client VM makes these tools run faster when
1.11 # it's available.
1.12 @@ -134,21 +134,14 @@
1.13 JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
1.14 JAVACFLAGS += $(OTHER_JAVACFLAGS)
1.15
1.16 -# Needed for javah
1.17 -JAVAHFLAGS += -classpath $(CLASSBINDIR)
1.18 -
1.19 # Langtools
1.20 ifdef LANGTOOLS_DIST
1.21 JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
1.22 - JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
1.23 JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
1.24 DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
1.25 JAVAC_CMD = $(BOOT_JAVA_CMD) \
1.26 "-Xbootclasspath/p:$(JAVAC_JAR)" \
1.27 -jar $(JAVAC_JAR) $(JAVACFLAGS)
1.28 - JAVAH_CMD = $(BOOT_JAVA_CMD) \
1.29 - "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
1.30 - -jar $(JAVAH_JAR) $(JAVAHFLAGS)
1.31 JAVADOC_CMD = $(BOOT_JAVA_CMD) \
1.32 "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
1.33 -jar $(JAVADOC_JAR)
1.34 @@ -156,8 +149,6 @@
1.35 # If no explicit tools, use boot tools (add VM flags in this case)
1.36 JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
1.37 $(JAVACFLAGS)
1.38 - JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
1.39 - $(JAVAHFLAGS)
1.40 JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
1.41 endif
1.42
