diff options
| author | Hierophect <hierophect@gmail.com> | 2020-01-08 17:37:20 -0500 |
|---|---|---|
| committer | Hierophect <hierophect@gmail.com> | 2020-01-08 17:37:20 -0500 |
| commit | 10eed78dd8047f406d3be26f540e39eecba437c7 (patch) | |
| tree | 9c98ced4121a2f5971f3326664e8253ba6d87051 | |
| parent | b74e78d2c049388f5cb17bf27cbef16379241f3d (diff) | |
use CFLAG to properly set define
| -rw-r--r-- | ports/stm32f4/mpconfigport.mk | 2 | ||||
| -rw-r--r-- | py/circuitpy_mpconfig.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/stm32f4/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk index 48bd3ad61..f214282cb 100644 --- a/ports/stm32f4/mpconfigport.mk +++ b/ports/stm32f4/mpconfigport.mk @@ -69,7 +69,7 @@ ifndef CIRCUITPY_DISPLAYIO CIRCUITPY_DISPLAYIO = 1 endif -MICROPY_CPYTHON_COMPAT = 1 +CFLAGS += -DMICROPY_CPYTHON_COMPAT=1 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx) #endif diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 8c7454cf2..5b705a088 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -182,7 +182,10 @@ typedef long mp_off_t; // Remove some lesser-used functionality to make small builds fit. #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (CIRCUITPY_FULL_BUILD) -#define MICROPY_CPYTHON_COMPAT (CIRCUITPY_FULL_BUILD) +//TODO: replace this with a rework of the FULL_BUILD system +#if !defined(MICROPY_CPYTHON_COMPAT) + #define MICROPY_CPYTHON_COMPAT (CIRCUITPY_FULL_BUILD) +#endif #define MICROPY_MODULE_WEAK_LINKS (CIRCUITPY_FULL_BUILD) #define MICROPY_PY_ALL_SPECIAL_METHODS (CIRCUITPY_FULL_BUILD) #define MICROPY_PY_BUILTINS_COMPLEX (CIRCUITPY_FULL_BUILD) |