From 4966f022db738c8d581aab9ae99ca3b9d26c3b27 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 4 Sep 2013 10:15:46 +0200 Subject: [PATCH] 8024155: Fix 'make CONF= ' Reviewed-by: erikj, tbell --- NewMakefile.gmk | 4 ++-- common/makefiles/Main.gmk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NewMakefile.gmk b/NewMakefile.gmk index 101ebe06278..141ea8fa4be 100644 --- a/NewMakefile.gmk +++ b/NewMakefile.gmk @@ -69,11 +69,11 @@ else # Run the makefile with an arbitraty 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 common/makefiles/Main.gmk SPEC=$(firstword $(SPEC)) | \ + $(MAKE) -p -q -f common/makefiles/Main.gmk 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),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true .PHONY: $(all_phony_targets) diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk index dd99df2d526..ef66073189b 100644 --- a/common/makefiles/Main.gmk +++ b/common/makefiles/Main.gmk @@ -242,7 +242,7 @@ clean-test: .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only -.PHONY: all clean dist-clean bootcycle-images start-make +.PHONY: default all clean dist-clean bootcycle-images start-make .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build .PHONY: profiles profiles-only profiles-oscheck