Skip to content

Commit 46cebac

Browse files
committed
flow: Makefile: Move variables.mk include
Include this file before the BLOCKS logic since it's using the WORK_HOME variable now, which is not defined before including this file. Signed-off-by: Daniel Schultz <[email protected]>
1 parent f3a536f commit 46cebac

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

flow/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ include $(DESIGN_CONFIG)
8989

9090
export DESIGN_DIR ?= $(dir $(DESIGN_CONFIG))
9191

92+
include $(FLOW_HOME)/scripts/variables.mk
93+
9294
# default value "base" is duplicated from variables.yaml because we need it
9395
# earlier in the flow for BLOCKS. BLOCKS is a feature specific to the
9496
# ORFS Makefile.
@@ -148,7 +150,6 @@ FLOW_HOME := $(abspath $(dir $(firstword $(MAKEFILE_LIST))))
148150
endif
149151
export FLOW_HOME
150152

151-
include $(FLOW_HOME)/scripts/variables.mk
152153

153154
define GENERATE_ABSTRACT_RULE
154155
ifeq ($(wildcard $(3)),)

0 commit comments

Comments
 (0)