changeset 927:cd3825b29830 jdk8-b120

8029515: Building multiple configurations fails after removal of old build system Reviewed-by: erikj
author ihse
date Mon, 09 Dec 2013 14:43:16 +0100
parents f204455b60cc
children 1e1f86d5d4e2
files Makefile make/MakeHelpers.gmk
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Dec 05 10:32:36 2013 -0800
+++ b/Makefile	Mon Dec 09 14:43:16 2013 +0100
@@ -66,12 +66,12 @@
     # First, find out the valid targets
     # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
     # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
-    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
-        $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
+    all_phony_targets=$(filter-out $(global_targets) bundles bundles-only final-images-only, $(strip $(shell \
+        cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \
         grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
 
     $(all_phony_targets):
-	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
+	@$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \
 	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
 
     .PHONY: $(all_phony_targets)
--- a/make/MakeHelpers.gmk	Thu Dec 05 10:32:36 2013 -0800
+++ b/make/MakeHelpers.gmk	Mon Dec 09 14:43:16 2013 +0100
@@ -50,7 +50,7 @@
 
 # Global targets are possible to run either with or without a SPEC. The prototypical
 # global target is "help".
-global_targets=help jprt% bridgeBuild
+global_targets=help jprt% bridgeBuild bridge2configure
 
 ##############################
 # Functions