Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/Rules.gmk	Mon Mar 09 13:33:56 2009 -0700
     1.2 +++ b/make/common/Rules.gmk	Wed Mar 11 14:38:02 2009 -0700
     1.3 @@ -191,14 +191,18 @@
     1.4  # Make sure all newer sources are compiled (in a batch)
     1.5  classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
     1.6  
     1.7 +# Use this javac option to force it to favor the sourcepath file classes
     1.8 +#   rather than any bootclasspath classes.
     1.9 +JAVAC_PREFER_SOURCE = -Xprefer:source
    1.10 +
    1.11  .compile.classlist : $(JAVA_SOURCE_LIST)
    1.12  	@$(MKDIR) -p $(CLASSDESTDIR)
    1.13  	@if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \
    1.14  	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
    1.15  	  $(CAT) $(JAVA_SOURCE_LIST); \
    1.16  	  $(ECHO) "# Running javac:"; \
    1.17 -	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    1.18 -	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    1.19 +	  $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    1.20 +	  $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    1.21  	fi
    1.22  	@$(java-vm-cleanup)
    1.23