[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 08/58: Revert "Honor '%fresh-auto-compile'."
From: |
Andy Wingo |
Subject: |
[Guile-commits] 08/58: Revert "Honor '%fresh-auto-compile'." |
Date: |
Tue, 7 Aug 2018 06:58:29 -0400 (EDT) |
wingo pushed a commit to branch lightning
in repository guile.
commit 2245c67c379ad62da77e68b5daa8e00b3833f9ff
Author: Ludovic Courtès <address@hidden>
Date: Mon Jan 15 23:17:24 2018 +0100
Revert "Honor '%fresh-auto-compile'."
This reverts commit 83d4c4d622b406ec0bc9d8139ec8182fa72b5720,
which came from a misunderstanding.
---
libguile/load.c | 9 +++------
module/ice-9/boot-9.scm | 5 +----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/libguile/load.c b/libguile/load.c
index e9d3e6c..aac789b 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -1202,16 +1202,13 @@ SCM_DEFINE (scm_primitive_load_path,
"primitive-load-path", 0, 0, 1,
*scm_loc_load_extensions, SCM_BOOL_F,
&stat_source);
- 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;
+ compiled_thunk = load_thunk_from_path (filename, full_filename, &stat_source,
+ &found_stale_compiled_file);
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)))
{
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 022c572..09eb871 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -3795,10 +3795,7 @@ when none is available, reading FILE-NAME with READER."
scmstat
go-file-name))))))
- (let ((compiled (and scmstat
- (or (and (not %fresh-auto-compile)
- (pre-compiled))
- (fallback)))))
+ (let ((compiled (and scmstat (or (pre-compiled) (fallback)))))
(if compiled
(begin
(if %load-hook
- [Guile-commits] branch lightning updated (0a01963 -> 0d00164), Andy Wingo, 2018/08/07
- [Guile-commits] 02/58: doc: Update LALR URL., Andy Wingo, 2018/08/07
- [Guile-commits] 06/58: Make sure the return value of 'scm_crypt' is always initialized., Andy Wingo, 2018/08/07
- [Guile-commits] 03/58: Fix 'crypt' deadlock upon error., Andy Wingo, 2018/08/07
- [Guile-commits] 01/58: Update NEWS for 2.2.3, Andy Wingo, 2018/08/07
- [Guile-commits] 07/58: No tabs in C code., Andy Wingo, 2018/08/07
- [Guile-commits] 04/58: 'load-thunk-from-memory' reports the correct error., Andy Wingo, 2018/08/07
- [Guile-commits] 13/58: srfi-18: 'thread-sleep!' timeout-as-a-number is relative., Andy Wingo, 2018/08/07
- [Guile-commits] 18/58: Fix typo in comment within numbers.c, Andy Wingo, 2018/08/07
- [Guile-commits] 08/58: Revert "Honor '%fresh-auto-compile'.",
Andy Wingo <=
- [Guile-commits] 15/58: Fix eta-conversion edge cases in peval., Andy Wingo, 2018/08/07
- [Guile-commits] 17/58: Fix minor typo in the PEG documentation., Andy Wingo, 2018/08/07
- [Guile-commits] 20/58: Avoid inexact arithmetic in the type inferrer for 'sqrt'., Andy Wingo, 2018/08/07
- [Guile-commits] 16/58: Fix a few typos in the manual., Andy Wingo, 2018/08/07
- [Guile-commits] 05/58: compile: Load language modules upfront., Andy Wingo, 2018/08/07
- [Guile-commits] 11/58: doc: Fix typo about SRFI-4 syntax., Andy Wingo, 2018/08/07
- [Guile-commits] 09/58: 'select' returns empty sets upon EINTR and EAGAIN., Andy Wingo, 2018/08/07
- [Guile-commits] 14/58: Recognize RISC-V compilation targets., Andy Wingo, 2018/08/07
- [Guile-commits] 21/58: goops: Fix 'instance?' to work on objects that aren't structs., Andy Wingo, 2018/08/07
- [Guile-commits] 10/58: build: Use 'sed' invocation compatible with BSD sed., Andy Wingo, 2018/08/07