py/dynruntime.mk: Set MICROPY_ENABLE_DYNRUNTIME instead of per module.

So this setting could be used by other source files if needed.
micropython · Apr 5, 2020 · c34e7b9 · c34e7b9
1 parent 994c1dd
commit c34e7b9
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6 deletions.
diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
@@ -1,4 +1,3 @@
-#define MICROPY_ENABLE_DYNRUNTIME (1)
 #define MICROPY_PY_BTREE (1)
 
 #include "py/dynruntime.h"

diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
@@ -1,4 +1,3 @@
-#define MICROPY_ENABLE_DYNRUNTIME (1)
 #define MICROPY_PY_FRAMEBUF (1)
 
 #include "py/dynruntime.h"

diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
@@ -1,4 +1,3 @@
-#define MICROPY_ENABLE_DYNRUNTIME (1)
 #define MICROPY_PY_UHEAPQ (1)
 
 #include "py/dynruntime.h"

diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
@@ -1,4 +1,3 @@
-#define MICROPY_ENABLE_DYNRUNTIME (1)
 #define MICROPY_PY_URANDOM (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 

diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
@@ -1,4 +1,3 @@
-#define MICROPY_ENABLE_DYNRUNTIME (1)
 #define MICROPY_STACK_CHECK (1)
 #define MICROPY_PY_URE (1)
 #define MICROPY_PY_URE_MATCH_GROUPS (1)

diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
@@ -1,4 +1,3 @@
-#define MICROPY_ENABLE_DYNRUNTIME (1)
 #define MICROPY_PY_UZLIB (1)
 
 #include "py/dynruntime.h"

diff --git a/py/dynruntime.h b/py/dynruntime.h
@@ -33,6 +33,10 @@
 #include "py/objstr.h"
 #include "py/objtype.h"
 
+#if !MICROPY_ENABLE_DYNRUNTIME
+#error "dynruntime.h included in non-dynamic-module build."
+#endif
+
 #undef MP_ROM_QSTR
 #undef MP_OBJ_QSTR_VALUE
 #undef MP_OBJ_NEW_QSTR

diff --git a/py/dynruntime.mk b/py/dynruntime.mk
@@ -27,6 +27,7 @@ CFLAGS += -std=c99
 CFLAGS += -Os
 CFLAGS += -Wall -Werror -DNDEBUG
 CFLAGS += -DNO_QSTR
+CFLAGS += -DMICROPY_ENABLE_DYNRUNTIME
 CFLAGS += -DMP_CONFIGFILE='<$(CONFIG_H)>'
 CFLAGS += -fpic -fno-common
 CFLAGS += -U _FORTIFY_SOURCE # prevent use of __*_chk libc functions