Mercurial > hg > openjdk > jdk6 > corba
changeset 64:a987ccd6f37b
6790292: BOOTDIR of jdk6 u12 will not work with jdk7 builds
Reviewed-by: tbell
| author | ohair |
|---|---|
| date | Wed, 04 Jan 2012 11:33:39 -0800 |
| parents | a976cb99adbb |
| children | 3f8d83b2fe9e cded4679e426 |
| files | make/common/Rules.gmk |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Rules.gmk Tue Nov 15 16:44:07 2011 -0800 +++ b/make/common/Rules.gmk Wed Jan 04 11:33:39 2012 -0800 @@ -191,14 +191,18 @@ # 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)