OpenJDK / portola / portola
changeset 27866:e6c790ef8899
8066761: Investigate -sourcepath usage when compiling java
Summary: Removed all uses of -sourcepath
Reviewed-by: jfranck, alanb, ihse
| author | erikj |
|---|---|
| date | Tue, 09 Dec 2014 08:56:44 +0100 |
| parents | 6c830e3b9caf |
| children | 92ece509f6bf |
| files | make/common/JavaCompilation.gmk |
| diffstat | 1 files changed, 1 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/JavaCompilation.gmk Tue Dec 09 08:49:22 2014 +0100 +++ b/make/common/JavaCompilation.gmk Tue Dec 09 08:56:44 2014 +0100 @@ -382,10 +382,6 @@ $2 := $$(subst $1,,$$($2)) endef -define replace_space_with_pathsep - $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2))) -endef - # Setup make rules for compiling Java source code to class files and/or a # resulting jar file. # @@ -408,8 +404,6 @@ # INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file! # EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file! # "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found. -# JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete -# source roots from SRC. This is sometimes needed when compiling specific subsets of the source. # HEADERS:=path to directory where all generated c-headers are written. # DEPENDS:=Extra dependecy # DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit. @@ -523,13 +517,6 @@ endif endif - # Prep the source paths. - ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),) - $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE))) - else - $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC))) - endif - # Create a sed expression to remove the source roots and to replace / with . # and remove .java at the end. $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g' @@ -612,7 +599,7 @@ $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp) $(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1 ($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \ - -implicit:none -sourcepath "$$($1_SRCROOTSC)" \ + -implicit:none \ -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \ $(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)