Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorkatleman
Tue, 21 May 2013 12:51:10 -0700
changeset 17353 85d7a82fdf4e
parent 17351 68e5149f5ea7 (current diff)
parent 17352 8b5c1e11c27b (diff)
child 17354 46c3a4b9ef6d
Merge
--- 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!
jdk-sandbox