OpenJDK / jdk / hs
changeset 23169:fdc2570ccbf4
8037238: JDK 9 images don't rebuild when access bridge jars rebuild
Reviewed-by: tbell
| author | erikj |
|---|---|
| date | Thu, 13 Mar 2014 17:18:11 +0100 |
| parents | d20a4165e3d2 |
| children | 51e606ecede5 |
| files | make/common/JavaCompilation.gmk make/common/MakeBase.gmk |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/JavaCompilation.gmk Tue Mar 11 12:04:50 2014 +0100 +++ b/make/common/JavaCompilation.gmk Thu Mar 13 17:18:11 2014 +0100 @@ -158,6 +158,10 @@ $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) endif endif + # The dependency list should never be empty + ifeq ($$(strip $$($1_DEPS)), ) + $$(warning No dependencies found for $1) + endif # Utility macros, to make the shell script receipt somewhat easier to decipher.
--- a/make/common/MakeBase.gmk Tue Mar 11 12:04:50 2014 +0100 +++ b/make/common/MakeBase.gmk Thu Mar 13 17:18:11 2014 +0100 @@ -436,7 +436,8 @@ # Param 1 - Dir to find in ifeq ($(OPENJDK_BUILD_OS),windows) define FillCacheFind - FIND_CACHE_DIR += $1 + # Remove any trailing slash from dirs in the cache dir list + FIND_CACHE_DIR += $$(patsubst %/,%, $1) FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l)) endef else @@ -451,7 +452,7 @@ # The extra - is needed when FIND_CACHE_DIR is empty but should be harmless. # Param 1 - Dirs to find in define CacheFind - $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \ + $(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIR)) $(FIND_CACHE_DIR),$1), \ $(shell $(FIND) $1 -type f -o -type l), \ $(filter $(addsuffix %,$1),$(FIND_CACHE))) endef