Skip to content

Commit 87369f4

Browse files
committed
Revert moving TCVARS_DONE to common.mk
1 parent 8915ddd commit 87369f4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

mk/spksrc.common.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ PWD := $(CURDIR)
1717
# makefiles.
1818
default: all
1919

20-
# Marks tc_vars generation as completed for stage1 (bootstrap)
21-
# used with spksrc.cross-cc.mk and spksrc.spk.mk
22-
TCVARS_DONE := $(WORK_DIR)/.tcvars_done
23-
2420
# Stop on first error
2521
SHELL := $(SHELL) -e
2622

mk/spksrc.cross-cc.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ include ../../mk/spksrc.plist.mk
135135
# - First call builds the toolchain (download / extract / patch / build)
136136
# - Second call generates tc_vars* files in the package WORK_DIR
137137
# -----------------------------------------------------------------------------
138+
TCVARS_DONE := $(WORK_DIR)/.tcvars_done
139+
138140
.PHONY: cross-stage1
139141
cross-stage1: $(TCVARS_DONE)
140142

mk/spksrc.spk.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,8 @@ package: $(SPK_FILE_NAME)
500500
# -----------------------------------------------------------------------------
501501
# Stage1: Toolchain bootstrap
502502
# -----------------------------------------------------------------------------
503+
TCVARS_DONE := $(WORK_DIR)/.tcvars_done
504+
503505
.PHONY: spk-stage1
504506
spk-stage1: $(TCVARS_DONE)
505507

0 commit comments

Comments
 (0)