mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 06:41:13 +02:00
* init.c: Make sure that scm_post_boot_init_modules is called only
once. (Important when using a dumped image.; Thanks to Bernard Urban.)
This commit is contained in:
parent
ad91d6c3ff
commit
b505860d29
1 changed files with 8 additions and 6 deletions
|
@ -320,11 +320,15 @@ scm_load_startup_files ()
|
||||||
|
|
||||||
/* Load Ice-9. */
|
/* Load Ice-9. */
|
||||||
if (!scm_ice_9_already_loaded)
|
if (!scm_ice_9_already_loaded)
|
||||||
scm_primitive_load_path (scm_makfrom0str ("ice-9/boot-9.scm"));
|
{
|
||||||
|
scm_primitive_load_path (scm_makfrom0str ("ice-9/boot-9.scm"));
|
||||||
|
|
||||||
/* Load the init.scm file. */
|
/* Load the init.scm file. */
|
||||||
if (SCM_NFALSEP (init_path))
|
if (SCM_NFALSEP (init_path))
|
||||||
scm_primitive_load (init_path);
|
scm_primitive_load (init_path);
|
||||||
|
|
||||||
|
scm_post_boot_init_modules ();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -563,8 +567,6 @@ invoke_main_func (body_data)
|
||||||
|
|
||||||
scm_load_startup_files ();
|
scm_load_startup_files ();
|
||||||
|
|
||||||
scm_post_boot_init_modules ();
|
|
||||||
|
|
||||||
(*closure->main_func) (closure->closure, closure->argc, closure->argv);
|
(*closure->main_func) (closure->closure, closure->argc, closure->argv);
|
||||||
|
|
||||||
/* never reached */
|
/* never reached */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue