Skip to content

Commit f9bbd05

Browse files
authored
Merge pull request #6492 from EmergReanimator/disabled_fs_support
Fixed build issue when DISABLE_FILESYSTEM is set.
2 parents 897297b + 3c58870 commit f9bbd05

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

supervisor/supervisor.mk

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ SRC_SUPERVISOR = \
1818
supervisor/shared/translate/translate.c \
1919
supervisor/shared/workflow.c
2020

21-
ifeq ($(DISABLE_FILESYSTEM),1)
22-
SRC_SUPERVISOR += supervisor/stub/filesystem.c
23-
else
24-
SRC_SUPERVISOR += supervisor/shared/filesystem.c
25-
endif
26-
2721
NO_USB ?= $(wildcard supervisor/usb.c)
2822

2923
INTERNAL_FLASH_FILESYSTEM ?= 0
@@ -35,6 +29,15 @@ CFLAGS += -DQSPI_FLASH_FILESYSTEM=$(QSPI_FLASH_FILESYSTEM)
3529
SPI_FLASH_FILESYSTEM ?= 0
3630
CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM)
3731

32+
DISABLE_FILESYSTEM ?= 0
33+
CFLAGS += -DDISABLE_FILESYSTEM=$(DISABLE_FILESYSTEM)
34+
35+
ifeq ($(DISABLE_FILESYSTEM),1)
36+
SRC_SUPERVISOR += supervisor/stub/filesystem.c
37+
else
38+
SRC_SUPERVISOR += supervisor/shared/filesystem.c
39+
endif
40+
3841
ifeq ($(CIRCUITPY_BLEIO),1)
3942
SRC_SUPERVISOR += supervisor/shared/bluetooth/bluetooth.c
4043
CIRCUITPY_CREATOR_ID ?= $(USB_VID)

0 commit comments

Comments
 (0)