Mercurial > people > andrew > aarch32
changeset 783:0f6dde6231bd
8024155: Fix 'make CONF= <target>'
Reviewed-by: erikj, tbell
| author | ihse |
|---|---|
| date | Wed, 04 Sep 2013 10:15:46 +0200 |
| parents | 92facce22941 |
| children | 8e7b4d9fb00f |
| files | NewMakefile.gmk common/makefiles/Main.gmk |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/NewMakefile.gmk Fri Aug 30 10:13:25 2013 +0200 +++ b/NewMakefile.gmk Wed Sep 04 10:15:46 2013 +0200 @@ -69,11 +69,11 @@ # 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)
--- a/common/makefiles/Main.gmk Fri Aug 30 10:13:25 2013 +0200 +++ b/common/makefiles/Main.gmk Wed Sep 04 10:15:46 2013 +0200 @@ -242,7 +242,7 @@ .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