summaryrefslogtreecommitdiff
path: root/libguile/load.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2011-02-13 19:18:02 +0100
committerLudovic Courtès <ludo@gnu.org>2011-02-13 19:18:02 +0100
commit5a79300f8596c4dc3ff71e9faa587531f76798f7 (patch)
treed1cc9153e382f7fb541fb771148fba7fd9824df1 /libguile/load.c
parenta4060f671073337e9dc5df64398972913bd71a52 (diff)
downloadguile-5a79300f8596c4dc3ff71e9faa587531f76798f7.tar.gz
Add `%auto-compilation-options', used by `compile-file' when auto-compiling.
* module/ice-9/boot-9.scm (%auto-compilation-options): New variable. (load-in-vicinity): Honor it. * libguile/load.c (kw_opts, sym_compile_file, sym_auto_compilation_options): New variables. (do_try_auto_compile): Honor %AUTO-COMPILATION-OPTIONS. * module/system/repl/common.scm (repl-default-options): Have `compile-options' default to %AUTO-COMPILATION-OPTIONS.
Diffstat (limited to 'libguile/load.c')
-rw-r--r--libguile/load.c28
1 files changed, 24 insertions, 4 deletions
diff --git a/libguile/load.c b/libguile/load.c
index 082bebb3d..c2380b94e 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -668,6 +668,10 @@ compiled_is_fresh (SCM full_filename, SCM compiled_filename)
}
SCM_KEYWORD (kw_env, "env");
+SCM_KEYWORD (kw_opts, "opts");
+
+SCM_SYMBOL (sym_compile_file, "compile-file");
+SCM_SYMBOL (sym_auto_compilation_options, "%auto-compilation-options");
static SCM
do_try_auto_compile (void *data)
@@ -680,14 +684,30 @@ do_try_auto_compile (void *data)
scm_newline (scm_current_error_port ());
comp_mod = scm_c_resolve_module ("system base compile");
- compile_file = scm_module_variable
- (comp_mod, scm_from_latin1_symbol ("compile-file"));
+ compile_file = scm_module_variable (comp_mod, sym_compile_file);
if (scm_is_true (compile_file))
{
/* Auto-compile in the context of the current module. */
- SCM res = scm_call_3 (scm_variable_ref (compile_file), source,
- kw_env, scm_current_module ());
+ SCM res, opts;
+ SCM args[5];
+
+ opts = scm_module_variable (scm_the_root_module (),
+ sym_auto_compilation_options);
+ if (SCM_VARIABLEP (opts))
+ opts = SCM_VARIABLE_REF (opts);
+ else
+ opts = SCM_EOL;
+
+ args[0] = source;
+ args[1] = kw_opts;
+ args[2] = opts;
+ args[3] = kw_env;
+ args[4] = scm_current_module ();
+
+ /* Assume `*current-warning-prefix*' has an appropriate value. */
+ res = scm_call_n (scm_variable_ref (compile_file), args, 5);
+
scm_puts (";;; compiled ", scm_current_error_port ());
scm_display (res, scm_current_error_port ());
scm_newline (scm_current_error_port ());