8029515: Building multiple configurations fails after removal of old build system jdk8-b120

Mon, 09 Dec 2013 14:43:16 +0100

author
ihse
date
Mon, 09 Dec 2013 14:43:16 +0100
changeset 919
cd3825b29830
parent 918
f204455b60cc
child 920
1e1f86d5d4e2

8029515: Building multiple configurations fails after removal of old build system
Reviewed-by: erikj

Makefile file | annotate | diff | comparison | revisions
make/MakeHelpers.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/Makefile	Thu Dec 05 10:32:36 2013 -0800
     1.2 +++ b/Makefile	Mon Dec 09 14:43:16 2013 +0100
     1.3 @@ -66,12 +66,12 @@
     1.4      # First, find out the valid targets
     1.5      # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
     1.6      # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
     1.7 -    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
     1.8 -        $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
     1.9 +    all_phony_targets=$(filter-out $(global_targets) bundles bundles-only final-images-only, $(strip $(shell \
    1.10 +        cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \
    1.11          grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    1.12  
    1.13      $(all_phony_targets):
    1.14 -	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    1.15 +	@$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \
    1.16  	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    1.17  
    1.18      .PHONY: $(all_phony_targets)
     2.1 --- a/make/MakeHelpers.gmk	Thu Dec 05 10:32:36 2013 -0800
     2.2 +++ b/make/MakeHelpers.gmk	Mon Dec 09 14:43:16 2013 +0100
     2.3 @@ -50,7 +50,7 @@
     2.4  
     2.5  # Global targets are possible to run either with or without a SPEC. The prototypical
     2.6  # global target is "help".
     2.7 -global_targets=help jprt% bridgeBuild
     2.8 +global_targets=help jprt% bridgeBuild bridge2configure
     2.9  
    2.10  ##############################
    2.11  # Functions

mercurial