mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py/builtinimport: Unbreak minimal build. 

These are workarounds required until frozen .mpy loading following standard
frozen modules code path.
This commit is contained in:
Paul Sokolovsky 2016-05-21 22:23:08 +03:00
parent daa4793578
commit 8a2970e136
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/builtinimport.c
View File

@ -63,10 +63,12 @@ bool mp_obj_is_package(mp_obj_t module) {
// Stat either frozen or normal module by a given path // Stat either frozen or normal module by a given path
// (whatever is available, if at all). // (whatever is available, if at all).
STATIC mp_import_stat_t mp_import_stat_any(const char *path) { STATIC mp_import_stat_t mp_import_stat_any(const char *path) {
#if MICROPY_MODULE_FROZEN_STR
mp_import_stat_t st = mp_frozen_stat(path); mp_import_stat_t st = mp_frozen_stat(path);
if (st != MP_IMPORT_STAT_NO_EXIST) { if (st != MP_IMPORT_STAT_NO_EXIST) {
return st; return st;
} }
#endif
return mp_import_stat(path); return mp_import_stat(path);
} }
@ -208,7 +210,7 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
{ {
void *modref; void *modref;
int frozen_type = mp_find_frozen_module(file_str, file->len, &modref); int frozen_type = mp_find_frozen_module(file_str, file->len, &modref);
#if MICROPY_PERSISTENT_CODE_LOAD #if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_MODULE_FROZEN_MPY
if (frozen_type == MP_FROZEN_MPY) { if (frozen_type == MP_FROZEN_MPY) {
do_execute_raw_code(module_obj, modref); do_execute_raw_code(module_obj, modref);
return; return;