Mercurial > hg > release > icedtea8-forest-3.0
changeset 758:e83abb0a04ab
Merge
author | katleman |
---|---|
date | Tue, 21 May 2013 12:51:10 -0700 |
parents | 40bba0507f76 (current diff) eea249c1ecee (diff) |
children | cb51fb4789ac |
files | |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/NewMakefile.gmk Fri May 17 10:06:56 2013 -0700 +++ b/NewMakefile.gmk Tue May 21 12:51:10 2013 -0700 @@ -73,7 +73,7 @@ grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) $(all_phony_targets): - @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true endif endif
--- a/common/autoconf/spec.gmk.in Fri May 17 10:06:56 2013 -0700 +++ b/common/autoconf/spec.gmk.in Tue May 21 12:51:10 2013 -0700 @@ -54,9 +54,9 @@ MAKE:=@MAKE@ -# Pass along the verbosity setting. +# Pass along the verbosity and log level settings. ifeq (,$(findstring VERBOSE=,$(MAKE))) - MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" + MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)" endif # No implicit variables or rules!