diff options
| author | ihse <none@none> | 2013-12-09 14:43:16 +0100 |
|---|---|---|
| committer | ihse <none@none> | 2013-12-09 14:43:16 +0100 |
| commit | 0ef3f69421c2f64ba0fba35f0c187da3c18b420b (patch) | |
| tree | e7d7208a68da20c0f7a5a60fe306a8af57bfa56b | |
| parent | 00abd5c85a9f3d1e216038ebfe176d57bdfb6848 (diff) | |
| download | jdk8u-0ef3f69421c2f64ba0fba35f0c187da3c18b420b.tar.gz | |
8029515: Building multiple configurations fails after removal of old build system
Reviewed-by: erikj
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | make/MakeHelpers.gmk | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -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 63223ee..66f4ca4 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 |