mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-09 23:40:29 +02:00
Code Activity

Merge until 83d4c4d622 from stable-2.2

Browse source
This commit is contained in:
Andy Wingo 2017-11-29 21:12:28 +01:00
commit b6762f5f7e
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/load.c
View file

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

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

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