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:
Matthew Flatt 2010-06-10 07:30:43 -04:00
parent ed1596db9b
commit 8603b6370b

View File

@ -1156,14 +1156,6 @@ static int run_from_cmd_line(int argc, char *_argv[],
sch_argv = create_cmdline_args_vector(argc, argv);
#ifndef NO_FILE_SYSTEM_UTILS
scheme_init_collection_paths_post(global_env, l, r);
#endif
}
if (no_compiled)
scheme_set_param(scheme_current_config(), MZCONFIG_USE_COMPILED_KIND, scheme_make_null());
{
Scheme_Object *ps;
scheme_set_exec_cmd(prog);
@ -1173,6 +1165,14 @@ static int run_from_cmd_line(int argc, char *_argv[],
ps = scheme_set_run_cmd(sprog);
}
#ifndef NO_FILE_SYSTEM_UTILS
scheme_init_collection_paths_post(global_env, l, r);
#endif
}
if (no_compiled)
scheme_set_param(scheme_current_config(), MZCONFIG_USE_COMPILED_KIND, scheme_make_null());
#ifndef NO_FILE_SYSTEM_UTILS
/* Setup path for "addon" directory: */
{