make/Init.gmk

*** 182,198 ****
--- 182,200 ----
          @$(if $(TARGET_DONE), \
            true \
          , \
            ( cd $(topdir) && \
            $(foreach spec, $(SPECS), \
+             $(call GenerateModuleDeps, $(spec)) && \
              $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
                  SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
                  main && \
              $(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
                  $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
                      SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
                      COMPARE_BUILD="$(COMPARE_BUILD)" pre-compare-build && \
+                 $(call GenerateModuleDeps, $(spec)) && \
                  $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
                      SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
                      COMPARE_BUILD="$(COMPARE_BUILD)" main && \
                  $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
                      SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
*** 224,235 ****
  
    # Parse COMPARE_BUILD (for makefile development)
    $(eval $(call ParseCompareBuild))
  
    ifeq ($(LOG_NOFILE), true)
!     # Disable log wrapper if LOG=[level,]nofile was given
!     override BUILD_LOG_WRAPPER :=
    endif
  
    ifeq ($(OUTPUT_SYNC_SUPPORTED), true)
      OUTPUT_SYNC_FLAG := -O$(OUTPUT_SYNC)
    endif
--- 226,237 ----
  
    # Parse COMPARE_BUILD (for makefile development)
    $(eval $(call ParseCompareBuild))
  
    ifeq ($(LOG_NOFILE), true)
!     # Disable build log if LOG=[level,]nofile was given
!     override BUILD_LOG_PIPE :=
    endif
  
    ifeq ($(OUTPUT_SYNC_SUPPORTED), true)
      OUTPUT_SYNC_FLAG := -O$(OUTPUT_SYNC)
    endif
*** 275,309 ****
  
    main: $(INIT_TARGETS)
          ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
            $(call RotateLogFiles)
            $(call PrepareFailureLogs)
!           $(BUILD_LOG_WRAPPER) $(PRINTF) "Building $(TARGET_DESCRIPTION)\n"
            ifneq ($(SEQUENTIAL_TARGETS), )
              # Don't touch build output dir since we might be cleaning. That
!             # means no log wrapper.
              ( cd $(TOPDIR) && \
                  $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
                  $(SEQUENTIAL_TARGETS) )
            endif
            ifneq ($(PARALLEL_TARGETS), )
              $(call StartGlobalTimer)
              $(call PrepareSmartJavac)
              ( cd $(TOPDIR) && \
!                 $(BUILD_LOG_WRAPPER) $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
                      -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
!                     $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) || \
!                 ( exitcode=$$? && $(BUILD_LOG_WRAPPER) \
!                 $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" && \
                  cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk \
                      HAS_SPEC=true on-failure ; \
                  exit $$exitcode ) )
              $(call CleanupSmartJavac)
              $(call StopGlobalTimer)
              $(call ReportBuildTimes)
            endif
!           $(BUILD_LOG_WRAPPER) $(PRINTF) "Finished building $(TARGET_DESCRIPTION)\n"
          endif
  
      on-failure:
          $(call PrintFailureReports)
          $(call PrintBuildLogFailures)
--- 277,312 ----
  
    main: $(INIT_TARGETS)
          ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
            $(call RotateLogFiles)
            $(call PrepareFailureLogs)
!           $(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
            ifneq ($(SEQUENTIAL_TARGETS), )
              # Don't touch build output dir since we might be cleaning. That
!             # means no log pipe.
              ( cd $(TOPDIR) && \
                  $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
                  $(SEQUENTIAL_TARGETS) )
            endif
            ifneq ($(PARALLEL_TARGETS), )
              $(call StartGlobalTimer)
              $(call PrepareSmartJavac)
              ( cd $(TOPDIR) && \
!                 $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
                      -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
!                     $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
!                 ( exitcode=$$? && \
!                 $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
!                     $(BUILD_LOG_PIPE) && \
                  cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk \
                      HAS_SPEC=true on-failure ; \
                  exit $$exitcode ) )
              $(call CleanupSmartJavac)
              $(call StopGlobalTimer)
              $(call ReportBuildTimes)
            endif
!           $(PRINTF) "Finished building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
          endif
  
      on-failure:
          $(call PrintFailureReports)
          $(call PrintBuildLogFailures)