mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

Revert "Honor '%fresh-auto-compile'."

Browse source 
This reverts commit 83d4c4d622,
which came from a misunderstanding.
This commit is contained in:
Ludovic Courtès 2018-01-15 23:17:24 +01:00
parent d01e0b084e
commit a1793bc904
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libguile/load.c
View file

@ -1,5 +1,5 @@
/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2004, 2006, 2008, /* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2004, 2006, 2008,
* 2009, 2010, 2011, 2012, 2013, 2014, 2017 Free Software Foundation, Inc. * 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -1195,16 +1195,13 @@ SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 0, 0, 1,
*scm_loc_load_extensions, SCM_BOOL_F, *scm_loc_load_extensions, SCM_BOOL_F,
&stat_source); &stat_source);
if (scm_is_false (*scm_loc_fresh_auto_compile)) compiled_thunk = load_thunk_from_path (filename, full_filename, &stat_source,
compiled_thunk = load_thunk_from_path (filename, full_filename,
&stat_source,
&found_stale_compiled_file); &found_stale_compiled_file);
else
compiled_thunk = SCM_BOOL_F;
if (scm_is_false (compiled_thunk) if (scm_is_false (compiled_thunk)
&& scm_is_true (full_filename) && scm_is_true (full_filename)
&& scm_is_true (*scm_loc_compile_fallback_path) && scm_is_true (*scm_loc_compile_fallback_path)
&& scm_is_false (*scm_loc_fresh_auto_compile)
&& scm_is_pair (*scm_loc_load_compiled_extensions) && scm_is_pair (*scm_loc_load_compiled_extensions)
&& scm_is_string (scm_car (*scm_loc_load_compiled_extensions))) && scm_is_string (scm_car (*scm_loc_load_compiled_extensions)))
{ {

5
module/ice-9/boot-9.scm
View file

@ -3811,10 +3811,7 @@ when none is available, reading FILE-NAME with READER."
scmstat scmstat
go-file-name)))))) go-file-name))))))
(let ((compiled (and scmstat (let ((compiled (and scmstat (or (pre-compiled) (fallback)))))
(or (and (not %fresh-auto-compile)
(pre-compiled))
(fallback)))))
(if compiled (if compiled
(begin (begin
(if %load-hook (if %load-hook