reorder executable-path initialization
fixes GRacket on Mac OS X and probably Win32; further fixes still needed to avoid allocating tagged objects before calling scheme_basic_env()
This commit is contained in:
parent
ed1596db9b
commit
8603b6370b
|
@ -1156,6 +1156,15 @@ static int run_from_cmd_line(int argc, char *_argv[],
|
||||||
|
|
||||||
sch_argv = create_cmdline_args_vector(argc, argv);
|
sch_argv = create_cmdline_args_vector(argc, argv);
|
||||||
|
|
||||||
|
{
|
||||||
|
Scheme_Object *ps;
|
||||||
|
scheme_set_exec_cmd(prog);
|
||||||
|
if (!sprog)
|
||||||
|
sprog = prog;
|
||||||
|
|
||||||
|
ps = scheme_set_run_cmd(sprog);
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef NO_FILE_SYSTEM_UTILS
|
#ifndef NO_FILE_SYSTEM_UTILS
|
||||||
scheme_init_collection_paths_post(global_env, l, r);
|
scheme_init_collection_paths_post(global_env, l, r);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1164,15 +1173,6 @@ static int run_from_cmd_line(int argc, char *_argv[],
|
||||||
if (no_compiled)
|
if (no_compiled)
|
||||||
scheme_set_param(scheme_current_config(), MZCONFIG_USE_COMPILED_KIND, scheme_make_null());
|
scheme_set_param(scheme_current_config(), MZCONFIG_USE_COMPILED_KIND, scheme_make_null());
|
||||||
|
|
||||||
{
|
|
||||||
Scheme_Object *ps;
|
|
||||||
scheme_set_exec_cmd(prog);
|
|
||||||
if (!sprog)
|
|
||||||
sprog = prog;
|
|
||||||
|
|
||||||
ps = scheme_set_run_cmd(sprog);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef NO_FILE_SYSTEM_UTILS
|
#ifndef NO_FILE_SYSTEM_UTILS
|
||||||
/* Setup path for "addon" directory: */
|
/* Setup path for "addon" directory: */
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user