Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/JavaCompilation.gmk	Thu Jun 27 09:27:06 2013 +0200
     1.2 +++ b/common/makefiles/JavaCompilation.gmk	Fri Jun 28 11:55:46 2013 +0200
     1.3 @@ -155,7 +155,7 @@
     1.4          # lines, but not here for use in make dependencies.
     1.5          $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
     1.6          ifeq (,$$($1_SKIP_METAINF))
     1.7 -            $1_DEPS+=$$(call CacheFind $$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
     1.8 +            $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
     1.9          endif
    1.10      endif
    1.11  
    1.12 @@ -255,12 +255,21 @@
    1.13      $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
    1.14      $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
    1.15  
    1.16 +    # To avoid running find over too large sets of files, which causes make to crash
    1.17 +    # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
    1.18 +    # of directories to run find in, if available.
    1.19 +    ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
    1.20 +	$1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC),\
    1.21 +		$$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
    1.22 +    else
    1.23 +        $1_FIND_LIST := $$($1_SRC)
    1.24 +    endif
    1.25 +
    1.26      # Find all files in the source tree.
    1.27      $1_ALL_SRCS := $$(call not-containing,_the.,\
    1.28 -            $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind $$($1_SRC))))
    1.29 +            $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind,$$($1_FIND_LIST))))
    1.30  
    1.31      ifneq ($$($1_INCLUDES),)
    1.32 -        $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
    1.33          ifneq ($$($1_SUFFIXES),)
    1.34              $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES),\
    1.35  		$$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
    1.36 @@ -269,12 +278,8 @@
    1.37          endif
    1.38      endif
    1.39      ifneq ($$($1_INCLUDE_FILES),)
    1.40 -        $1_SRC_INCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
    1.41          $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
    1.42      endif
    1.43 -    ifneq ($$($1_SRC_INCLUDES),)
    1.44 -        $1_ALL_SRCS     := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS))
    1.45 -    endif
    1.46      ifneq ($$($1_EXCLUDES),)
    1.47          $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
    1.48          $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))