Revert "build-matrix: use $(newline) instead of ; to enter command"

This reverts commits e21b7281 and f3a7e0f2d0.

The performance penalty is not worth it. On a relatively slow box
the time spent went from 4.6s to 15s.
pull/526/merge
Timothy Gu 10 years ago
parent e21b728194
commit e8b457a582

@ -601,27 +601,29 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
@echo '</tr>' >> $@
@echo '</thead>' >> $@
@echo '<tbody>' >> $@
@$(foreach PKG,$(PKGS), \
@{ $(foreach PKG,$(PKGS), \
$(eval $(PKG)_VIRTUAL := $(true)) \
$(eval $(PKG)_BUILD_ONLY := $(true)) \
echo '<tr>' >> $@ $(newline) \
echo '<th class="row">$(PKG)</th>' >> $@ $(newline) \
echo '<tr> \
<th class="row">$(PKG)</th> \
$(foreach TARGET,$(MXE_TARGET_LIST), \
$(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \
$(eval $(TARGET)_PKGCOUNT := $(call inc,$($(TARGET)_PKGCOUNT))) \
$(eval $(PKG)_VIRTUAL := $(false)) \
$(eval $(PKG)_BUILD_ONLY := $(false)) \
echo '<td class="supported">&#x2713;</td>' >> $@ $(newline), \
echo '<td class="unsupported">&#x2717;</td>' >> $@ $(newline))) \
<td class="supported">&#x2713;</td>, \
<td class="unsupported">&#x2717;</td>)) \
$(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \
$(eval BUILD_PKGCOUNT := $(call inc,$(BUILD_PKGCOUNT))) \
$(eval $(PKG)_VIRTUAL := $(false)) \
echo '<td class="supported">&#x2713;</td>' >> $@ $(newline), \
echo '<td class="unsupported">&#x2717;</td>' >> $@ $(newline)) \
<td class="supported">&#x2713;</td>, \
<td class="unsupported">&#x2717;</td>) \
</tr>'; \
$(if $($(PKG)_VIRTUAL), \
$(eval VIRTUAL_PKGCOUNT := $(call inc,$(VIRTUAL_PKGCOUNT)))) \
$(if $($(PKG)_BUILD_ONLY), \
$(eval BUILD_ONLY_PKGCOUNT := $(call inc,$(BUILD_ONLY_PKGCOUNT)))))
$(eval BUILD_ONLY_PKGCOUNT := $(call inc,$(BUILD_ONLY_PKGCOUNT))))) \
} >> $@
@echo '<tr>' >> $@
@# TOTAL_PKGCOUNT = ( PKGS - VIRTUAL ) - BUILD_ONLY
$(eval TOTAL_PKGCOUNT := \
@ -632,7 +634,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
@echo 'Total: $(TOTAL_PKGCOUNT)<br>(+$(VIRTUAL_PKGCOUNT) virtual +$(BUILD_ONLY_PKGCOUNT) native-only)' >> $@
@echo '</th>' >> $@
@$(foreach TARGET,$(MXE_TARGET_LIST), \
echo '<th>$($(TARGET)_PKGCOUNT)</th>' >> $@ $(newline))
echo '<th>$($(TARGET)_PKGCOUNT)</th>' >> $@;)
@echo '<th>$(BUILD_PKGCOUNT)</th>' >> $@
@echo '</tr>' >> $@
@echo '</tbody>' >> $@

Loading…
Cancel
Save