Skip to content

Commit 83b49a7

Browse files
committed
---
yaml --- r: 33708 b: refs/heads/snap-stage3 c: e4c0fad h: refs/heads/master v: v3
1 parent 995c06b commit 83b49a7

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 2fd2a56063637c4051ee95cf5cb49c629b900aa7
4+
refs/heads/snap-stage3: e4c0fad28f0c6c3cb7c147c08414edeb2224b5d5
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)