diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-10-10 23:55:11 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-10-10 23:56:13 (GMT) |
| commit | e8b457a582b4bab60f20efe74ccdf6ede223bbdd (patch) | |
| tree | 24631f872983fa1f82d0b2c796486896f20237d7 /Makefile | |
| parent | e21b72819480529e6a61590b14d7b992e6200584 (diff) | |
| download | mxe-e8b457a582b4bab60f20efe74ccdf6ede223bbdd.zip mxe-e8b457a582b4bab60f20efe74ccdf6ede223bbdd.tar.gz mxe-e8b457a582b4bab60f20efe74ccdf6ede223bbdd.tar.bz2 | |
Revert "build-matrix: use $(newline) instead of ; to enter command"
This reverts commits e21b7281 and f3a7e0f2d01.
The performance penalty is not worth it. On a relatively slow box
the time spent went from 4.6s to 15s.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -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">✓</td>' >> $@ $(newline), \ - echo '<td class="unsupported">✗</td>' >> $@ $(newline))) \ + <td class="supported">✓</td>, \ + <td class="unsupported">✗</td>)) \ $(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \ $(eval BUILD_PKGCOUNT := $(call inc,$(BUILD_PKGCOUNT))) \ $(eval $(PKG)_VIRTUAL := $(false)) \ - echo '<td class="supported">✓</td>' >> $@ $(newline), \ - echo '<td class="unsupported">✗</td>' >> $@ $(newline)) \ + <td class="supported">✓</td>, \ + <td class="unsupported">✗</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>' >> $@ |