8016303: make CONF= isn't working

Fri, 28 Jun 2013 12:00:03 +0200

author
erikj
date
Fri, 28 Jun 2013 12:00:03 +0200
changeset 753
0e533ceee717
parent 752
0871b5799149
child 754
78aaf5d3314d

8016303: make CONF= isn't working
Reviewed-by: tbell

NewMakefile.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/NewMakefile.gmk	Fri Jun 28 11:58:16 2013 +0200
     1.2 +++ b/NewMakefile.gmk	Fri Jun 28 12:00:03 2013 +0200
     1.3 @@ -68,12 +68,15 @@
     1.4          # First, find out the valid targets
     1.5          # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find
     1.6          # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
     1.7 -        all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \
     1.8 -            $(MAKE) -p -q -f common/makefiles SPEC=$(firstword $(SPEC)) | \
     1.9 +        all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
    1.10 +            $(MAKE) -p -q -f common/makefiles/Main.gmk SPEC=$(firstword $(SPEC)) | \
    1.11              grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    1.12  
    1.13 -$(all_phony_targets):
    1.14 -	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    1.15 +        $(all_phony_targets):
    1.16 +		$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    1.17 +			$(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    1.18 +
    1.19 +        .PHONY: $(all_phony_targets)
    1.20  
    1.21      endif
    1.22  endif

mercurial