summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-01-21 16:32:44 +0100
committerLudovic Courtès <ludo@gnu.org>2022-01-23 23:03:33 +0100
commit97a6b4581ae68bfee3c907eb4c5af686052ea45f (patch)
tree26f0194caeacb27617cd82071063a5faf8db4921
parent8ef0473969576d54c17e5d18d9caba0ff5b8a681 (diff)
compile: Really disable cross-module inlining and related features.
This is a followup to d87a1ba6b8b2f08ba6898033353d7463355bd146. * guix/build/compile.scm (strip-keyword-arguments): Rename to... (clear-keyword-arguments): ... this, and set the value associated with each of KEYWORDS to #f. (optimizations-for-level): Adjust accordingly.
-rw-r--r--guix/build/compile.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/build/compile.scm b/guix/build/compile.scm
index 82761a2190..5b27b55d02 100644
--- a/guix/build/compile.scm
+++ b/guix/build/compile.scm
@@ -37,8 +37,8 @@
;;;
;;; Code:
-(define (strip-keyword-arguments keywords args) ;XXX: copied from (guix utils)
- "Remove all of the keyword arguments listed in KEYWORDS from ARGS."
+(define (clear-keyword-arguments keywords args)
+ "Set to #f the value associated with each of the KEYWORDS in ARGS."
(let loop ((args args)
(result '()))
(match args
@@ -47,7 +47,7 @@
(((? keyword? kw) arg . rest)
(loop rest
(if (memq kw keywords)
- result
+ (cons* #f kw result)
(cons* arg kw result))))
((head . tail)
(loop tail (cons head result))))))
@@ -82,7 +82,7 @@
;; non-reproducible and more expensive builds, so we turn it off
;; here:
;; <https://wingolog.org/archives/2021/05/13/cross-module-inlining-in-guile>.
- (strip-keyword-arguments '(#:inlinable-exports? #:resolve-free-vars?
+ (clear-keyword-arguments '(#:inlinable-exports? #:resolve-free-vars?
#:cross-module-inlining?)
(if (<= level 1)
%lightweight-optimizations