From 1606607bd42ce36f7d892c14b29046b7152d0fa6 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 12 Oct 2014 03:12:58 +0300
Subject: [PATCH] modure: Make sure that re1.5 compiled in only of modure
itself is enabled.
This is achieved by including re1.5 *.c files straight from modure.c .
---
extmod/modure.c | 8 ++++++++
py/py.mk | 7 -------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/extmod/modure.c b/extmod/modure.c
index b6560599a..7acc045e7 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -238,4 +238,12 @@ const mp_obj_module_t mp_module_ure = {
.globals = (mp_obj_dict_t*)&mp_module_re_globals,
};
+// Source files #include'd here to make sure they're compiled in
+// only if module is enabled by config setting.
+
+#define re1_5_fatal(x) assert(!x)
+#include "re1.5/compilecode.c"
+#include "re1.5/dumpcode.c"
+#include "re1.5/recursiveloop.c"
+
#endif //MICROPY_PY_URE
diff --git a/py/py.mk b/py/py.mk
index bd5e69598..e74d557e4 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -114,9 +114,6 @@ PY_O_BASENAME = \
../extmod/modzlibd.o \
../extmod/modujson.o \
../extmod/modure.o \
- ../extmod/re1.5/compilecode.o \
- ../extmod/re1.5/dumpcode.o \
- ../extmod/re1.5/recursiveloop.o \
# prepend the build destination prefix to the py object files
PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME))
@@ -169,7 +166,3 @@ $(PY_BUILD)/gc.o: CFLAGS += $(CSUPEROPT)
# optimising vm for speed, adds only a small amount to code size but makes a huge difference to speed (20% faster)
$(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT)
-
-# Additional options for 3rd-party libs
-
-$(PY_BUILD)/../extmod/re1.5/recursiveloop.o: CFLAGS += "-Dre1_5_fatal(x)=assert(!x)"
--
GitLab