guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/06: build: Build guix.scm and gnu.scm.


From: guix-commits
Subject: 06/06: build: Build guix.scm and gnu.scm.
Date: Fri, 25 Jun 2021 09:12:51 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 0a02abde88ce16315277239c081c6222a4db88d2
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jun 25 15:09:26 2021 +0200

    build: Build guix.scm and gnu.scm.
    
    Fixes a regression introduced in
    ef82ba9dd94369926eb13325d5e7da4306d23dd7 that was causing these two
    files to not be built.  In turn, 'tests/inferior.scm' would determine
    the wrong %TOP-BUILDDIR value, causing the "&inferior-exception" test to
    fail because for lack of an inferior stack trace.
    
    * Makefile.am (MODULES_CORE): Add guix.scm.
    (MODULES_SYSTEM): Add gnu.scm.
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7bb5de0..dd34447 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -690,9 +690,9 @@ endef
 # in <https://issues.guix.gnu.org/48963>.  Each 'eval' call below creates a
 # 'make-*-go' phony target that builds the corresponding subset.
 
-MODULES_CORE     = $(filter-out guix/scripts/%,$(filter guix/%,$(MODULES)))
+MODULES_CORE     = guix.scm $(filter-out guix/scripts/%,$(filter 
guix/%,$(MODULES)))
 MODULES_PACKAGES = $(filter gnu/packages/%,$(MODULES))
-MODULES_SYSTEM   = $(filter-out gnu/packages/%,$(filter gnu/%,$(MODULES)))
+MODULES_SYSTEM   = gnu.scm $(filter-out gnu/packages/%,$(filter 
gnu/%,$(MODULES)))
 MODULES_CLI      = $(filter guix/scripts/%,$(MODULES))
 
 $(eval $(call guile-compilation-rule,make-core-go,     \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]