diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-11-02 08:49:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 08:49:33 -0400 |
| commit | fa1edb2a01f7238ac6fc108142aae35faf7f9b15 (patch) | |
| tree | c20be82d6ce362d38a083bf107b6d5be574e53ac /ports | |
| parent | af7a0eedf03b9c028aead1a782d08d9680d6b4b0 (diff) | |
| parent | 4dfba2f8acec7d76fa61c13fcec662b6d957f69a (diff) | |
Merge pull request #1314 from dhalbert/3.x-frozen-before-lib3.1.1
3.x: put .frozen before /lib in sys.path; update frozen libraries
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk | 2 | ||||
| -rw-r--r-- | ports/esp8266/main.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk index 0f8d0f9ca..ddc262a57 100644 --- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk @@ -10,6 +10,8 @@ LONGINT_IMPL = NONE CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 +CFLAGS_INLINE_LIMIT = 45 + # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c index c590ab59e..dda17bb37 100644 --- a/ports/esp8266/main.c +++ b/ports/esp8266/main.c @@ -95,10 +95,11 @@ STATIC void mp_reset(void) { mp_init(); mp_obj_list_init(mp_sys_path, 0); mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script) - mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib)); mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_)); // Frozen modules are in their own pseudo-dir, e.g., ".frozen". + // Prioritize .frozen over /lib. mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_FROZEN_FAKE_DIR_QSTR)); + mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib)); mp_obj_list_init(mp_sys_argv, 0); |