Skip to content

Commit 934534c

Browse files
committed
fix logic for suppressing ja and ko clean builds when not necessary
1 parent 83fcdba commit 934534c

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

ports/atmel-samd/mpconfigport.mk

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,19 @@ CIRCUITPY_USB_CDC ?= 0
5454

5555
CIRCUITPY_ULAB = 0
5656

57-
ifeq ($(TRANSLATION),ja)
58-
ifeq ($(CIRCUITPY_DISPLAYIO),1)
59-
RELEASE_NEEDS_CLEAN_BUILD = 1
57+
# We don't have room for the fonts for terminalio for ja and ko
58+
# so turn off terminalio, and if it's off and displayio is on,
59+
# force a clean build.
60+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
61+
# ifeq, because it's not set yet.
62+
ifeq ($(TRANSLATION), ja)
6063
CIRCUITPY_TERMINALIO = 0
61-
endif
64+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
6265
endif
6366

64-
ifeq ($(TRANSLATION),ko)
65-
ifeq ($(CIRCUITPY_DISPLAYIO),1)
66-
RELEASE_NEEDS_CLEAN_BUILD = 1
67+
ifeq ($(TRANSLATION), ko)
6768
CIRCUITPY_TERMINALIO = 0
68-
endif
69+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
6970
endif
7071

7172
endif # samd21

0 commit comments

Comments
 (0)