8000 fix logic for suppressing ja and ko clean builds when not necessary · michthom/circuitpython@ea0e18d · GitHub
[go: up one dir, main page]
Skip to content

Commit ea0e18d

Browse files
dhalbertdhalbert
committed
fix logic for suppressing ja and ko clean builds when not necessary
1 parent 1e2a945 commit ea0e18d

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
@@ -60,18 +60,19 @@ CIRCUITPY_VECTORIO = 0
6060

6161
MICROPY_PY_ASYNC_AWAIT = 0
6262

63-
ifeq ($(TRANSLATION),ja)
64-
ifeq ($(CIRCUITPY_DISPLAYIO),1)
65-
RELEASE_NEEDS_CLEAN_BUILD = 1
63+
# We don't have room for the fonts for terminalio for ja and ko
64+
# so turn off terminalio, and if it's off and displayio is on,
65+
# force a clean build.
66+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
67+
# ifeq, because it's not set yet.
68+
ifeq ($(TRANSLATION), ja)
6669
CIRCUITPY_TERMINALIO = 0
67-
endif
70+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
6871
endif
6972

70-
ifeq ($(TRANSLATION),ko)
71-
ifeq ($(CIRCUITPY_DISPLAYIO),1)
72-
RELEASE_NEEDS_CLEAN_BUILD = 1
73+
ifeq ($(TRANSLATION), ko)
7374
CIRCUITPY_TERMINALIO = 0
74-
endif
75+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
7576
endif
7677

7778
SUPEROPT_GC = 0

0 commit comments

Comments
 (0)
0