make/Init.gmk

@@ -115,11 +115,11 @@
     $(eval $(call CheckInvalidMakeFlags))
 
     # Check that CONF_CHECK is valid.
     $(eval $(call ParseConfCheckOption))
 
-    # Check that the LOG given is valid, and set LOG_LEVEL, LOG_NOFILE and MAKE_LOG_FLAGS.
+    # Check that the LOG given is valid, and set LOG_LEVEL, LOG_NOFILE, MAKE_LOG_VARS and MAKE_LOG_FLAGS.
     $(eval $(call ParseLogLevel))
 
     # After this SPECS contain 1..N spec files (otherwise ParseConfAndSpec fails).
     $(eval $(call ParseConfAndSpec))
 

@@ -169,11 +169,11 @@
               $(COMMAND_LINE_VARIABLES) $(MAKECMDGOALS))')
         endif
 
     MAKE_INIT_WITH_SPEC_ARGUMENTS := ACTUAL_TOPDIR=$(topdir) \
         USER_MAKE_VARS="$(USER_MAKE_VARS)" MAKE_LOG_FLAGS=$(MAKE_LOG_FLAGS) \
-        LOG_LEVEL=$(LOG_LEVEL) LOG_NOFILE=$(LOG_NOFILE) LOG_CMDLINES=$(LOG_CMDLINES) \
+        $(MAKE_LOG_VARS) \
         INIT_TARGETS="$(INIT_TARGETS)" \
         SEQUENTIAL_TARGETS="$(SEQUENTIAL_TARGETS)" \
         PARALLEL_TARGETS="$(PARALLEL_TARGETS)"
 
     # Now the init and main targets will be called, once for each SPEC. The

@@ -317,18 +317,20 @@
           endif
           if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
             exit 1 ; \
           fi
           $(PRINTF) "Finished building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
+          $(call ReportProfileTimes)
         endif
 
     on-failure:
         $(call CleanupSmartJavac)
         $(call StopGlobalTimer)
         $(call ReportBuildTimes)
         $(call PrintFailureReports)
         $(call PrintBuildLogFailures)
+        $(call ReportProfileTimes)
         $(PRINTF) "Hint: If caused by a warning, try configure --disable-warnings-as-errors.\n\n"
         ifneq ($(COMPARE_BUILD), )
           $(call CleanupCompareBuild)
         endif