Changeset 152

Timestamp:

Sep 19, 2010, 6:39:13 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Make sure that javah in packages that use a non-standard CLASSDESTDIR location can find package classes by adding it to -bootclasspath (on Windows it worked because these classes were found in the bootstrap Java's .jars which is apparently wrong) [vendor bug].

File:

• trunk/openjdk/jdk/make/common/shared/Defs-java.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/shared/Defs-java.gmk

@@ -125 +125 @@
 
 # Needed for javah
-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
+JAVAHFLAGS += -bootclasspath $(if $(filter $(CLASSBINDIR),$(CLASSDESTDIR)),\
+        $(CLASSBINDIR),$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR))
 
 # Needed for JAVADOC and BOOT_JAVACFLAGS