diff options
author | Andy Wingo <wingo@pobox.com> | 2009-06-03 23:59:58 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-06-03 23:59:58 +0200 |
commit | c2521a212417b095475148e321daaf6e59ef5b3d (patch) | |
tree | c0afcd303a9225f7038e49c337559b0d786e2586 /libguile/load.c | |
parent | 6fd367e742f42421d81362a6ee8b51bb7b35a9ab (diff) | |
download | guile-c2521a212417b095475148e321daaf6e59ef5b3d.tar.gz |
fix error autocompiling parts of the compiler; make check works
* libguile/load.c (scm_try_autocompile): Punt if compiled-file-name does
not resolve, which would indicate that the file in question is part of
the compiler itself.
* test-suite/tests/elisp.test: Today I was an evil one -- disable
autocompilation for the elisp tests, as they are meant only for the
memoizer's eyes. Hopefully Daniel will fix this :-)
Diffstat (limited to 'libguile/load.c')
-rw-r--r-- | libguile/load.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libguile/load.c b/libguile/load.c index ac9cc7dad..4e127d68c 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -641,7 +641,19 @@ scm_try_autocompile (SCM source, SCM stale_compiled) } comp_mod = scm_c_resolve_module ("system base compile"); - compiled_file_name = scm_c_module_lookup (comp_mod, "compiled-file-name"); + compiled_file_name = + scm_module_variable (comp_mod, + scm_from_locale_symbol ("compiled-file-name")); + + if (scm_is_false (compiled_file_name)) + { + scm_puts (";;; it seems ", scm_current_error_port ()); + scm_display (source, scm_current_error_port ()); + scm_puts ("\n;;; is part of the compiler; skipping autocompilation\n", + scm_current_error_port ()); + return SCM_BOOL_F; + } + new_compiled = scm_call_1 (scm_variable_ref (compiled_file_name), source); if (scm_is_false (new_compiled)) |