From e5e1bbdd7ef7aa850f7172d2911c3cf5dbed5496 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 9 Dec 2013 14:43:16 +0100
Subject: [PATCH] 8029515: Building multiple configurations fails after removal
 of old build system

Reviewed-by: erikj
---
 Makefile             | 6 +++---
 make/MakeHelpers.gmk | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c0210786d59..cd5f66b50cc 100644
--- a/Makefile
+++ b/Makefile
@@ -66,12 +66,12 @@ else
     # 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)
diff --git a/make/MakeHelpers.gmk b/make/MakeHelpers.gmk
index 63223ee15cb..66f4ca4b763 100644
--- a/make/MakeHelpers.gmk
+++ b/make/MakeHelpers.gmk
@@ -50,7 +50,7 @@ BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
 
 # 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