fix logic for suppressing ja and ko clean builds when not necessary

This commit is contained in:
Dan Halbert 2021-05-14 23:41:44 -04:00
parent 83fcdba9c4
commit 934534c9ee

View File

@ -54,18 +54,19 @@ CIRCUITPY_USB_CDC ?= 0
CIRCUITPY_ULAB = 0 CIRCUITPY_ULAB = 0
ifeq ($(TRANSLATION),ja) # We don't have room for the fonts for terminalio for ja and ko
ifeq ($(CIRCUITPY_DISPLAYIO),1) # so turn off terminalio, and if it's off and displayio is on,
RELEASE_NEEDS_CLEAN_BUILD = 1 # force a clean build.
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
# ifeq, because it's not set yet.
ifeq ($(TRANSLATION), ja)
CIRCUITPY_TERMINALIO = 0 CIRCUITPY_TERMINALIO = 0
endif RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
endif endif
ifeq ($(TRANSLATION),ko) ifeq ($(TRANSLATION), ko)
ifeq ($(CIRCUITPY_DISPLAYIO),1)
RELEASE_NEEDS_CLEAN_BUILD = 1
CIRCUITPY_TERMINALIO = 0 CIRCUITPY_TERMINALIO = 0
endif RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
endif endif
endif # samd21 endif # samd21