diff options
| author | ohair <none@none> | 2009-03-11 14:38:02 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2009-03-11 14:38:02 -0700 |
| commit | 26b2146912225328d5589405ae02e2f171b0a602 (patch) | |
| tree | dbada475583245e671855e7a86f91e1c8d235811 /make/common | |
| parent | 78d6d28d268ef516597be9c3cdbc2c6e585bbae1 (diff) | |
6790292: BOOTDIR of jdk6 u12 will not work with jdk7 builds
Reviewed-by: tbell
Diffstat (limited to 'make/common')
| -rw-r--r-- | make/common/Rules.gmk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make/common/Rules.gmk b/make/common/Rules.gmk index c9605aa..aa674a9 100644 --- a/make/common/Rules.gmk +++ b/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) |