Skip to content

Commit 9d9c3b6

Browse files
committed
---
yaml --- r: 40415 b: refs/heads/dist-snap c: e4c0fad h: refs/heads/master i: 40413: 58e86dd 40411: 56f4464 40407: 28b4319 40399: e7cefe1 40383: 300d22f v: v3
1 parent 15d29f7 commit 9d9c3b6

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
99
refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
10-
refs/heads/dist-snap: 2fd2a56063637c4051ee95cf5cb49c629b900aa7
10+
refs/heads/dist-snap: e4c0fad28f0c6c3cb7c147c08414edeb2224b5d5
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/Makefile.in

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,13 +351,13 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
351351
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUNTIME) \
352352
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
353353

354-
# Prerequisites for a working stageN compiler and libraries
354+
# Prerequisites for a working stageN compiler and libraries, for a specific target
355355
SREQ$(1)_T_$(2)_H_$(3) = \
356356
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
357357
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
358358
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
359359

360-
# Prerequisites for a working stageN compiler and libraries
360+
# Prerequisites for a working stageN compiler and libraries, for a specific target
361361
CSREQ$(1)_T_$(2)_H_$(3) = \
362362
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
363363
$$(HBIN$(1)_H_$(3))/fuzzer$$(X) \
@@ -472,11 +472,22 @@ CFG_INFO := $(info cfg: *** compiler is in snapshot transition ***)
472472
CFG_INFO := $(info cfg: *** stage2 and later will not be built ***)
473473
CFG_INFO := $(info cfg:)
474474

475+
#XXX This is surely busted
475476
all: $(SREQ1$(CFG_HOST_TRIPLE)) $(GENERATED) docs
476477

477478
else
478479

479-
all: $(CSREQ3$(CFG_HOST_TRIPLE)) $(GENERATED) docs
480+
define ALL_TARGET_N
481+
all-target-$(1)-host-$(2): $$(CSREQ2_T_$(1)_H_$(2))
482+
endef
483+
484+
$(foreach target,$(CFG_TARGET_TRIPLES), \
485+
$(eval $(call ALL_TARGET_N,$(target),$(CFG_HOST_TRIPLE))))
486+
487+
ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
488+
all-target-$(target)-host-$(CFG_HOST_TRIPLE))
489+
490+
all: $(ALL_TARGET_RULES) $(GENERATED) docs
480491

481492
endif
482493

0 commit comments

Comments
 (0)