summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2018-11-15 15:00:23 -0500
committerDan Halbert <halbert@halwitz.org>2018-11-15 15:00:23 -0500
commit11de8fdca76da455ce52ca0fdd46fb70ce237dd9 (patch)
tree8f87648977c541995c9a3c62476d5e4003f66468 /main.c
parent7e2a3bf52edbf7c94939bdb82da7f6f9e0889268 (diff)
parent3ace9ea9ead7be770595ab82439ee1ce3ec2c174 (diff)
merge 3.x swap of /lib and .frozen; update frozen libs
Diffstat (limited to 'main.c')
-rwxr-xr-xmain.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main.c b/main.c
index ac55b72ba..974f045fa 100755
--- a/main.c
+++ b/main.c
@@ -108,9 +108,10 @@ void start_mp(supervisor_allocation* heap) {
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_));
- mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
// 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);