From 9e5762a5cfde9de4f8fb44941b04f9032a729d0c Mon Sep 17 00:00:00 2001 From: ohair Date: Wed, 11 Mar 2009 14:38:02 -0700 Subject: [PATCH] 6790292: BOOTDIR of jdk6 u12 will not work with jdk7 builds Reviewed-by: tbell --- corba/make/common/Rules.gmk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/corba/make/common/Rules.gmk b/corba/make/common/Rules.gmk index c9605aafba..aa674a9bd9 100644 --- a/corba/make/common/Rules.gmk +++ b/corba/make/common/Rules.gmk @@ -191,14 +191,18 @@ $(JAVA_SOURCE_LIST) : source_list_prime resources $(FILES_class) # Make sure all newer sources are compiled (in a batch) classes : $(CLASSES_INIT) .delete.classlist .compile.classlist +# Use this javac option to force it to favor the sourcepath file classes +# rather than any bootclasspath classes. +JAVAC_PREFER_SOURCE = -Xprefer:source + .compile.classlist : $(JAVA_SOURCE_LIST) @$(MKDIR) -p $(CLASSDESTDIR) @if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \ $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ $(CAT) $(JAVA_SOURCE_LIST); \ $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup) -- GitLab