[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
45/48: Revert "compile: Run the load phase within 'with-target'."
From: |
guix-commits |
Subject: |
45/48: Revert "compile: Run the load phase within 'with-target'." |
Date: |
Sun, 19 Apr 2020 10:22:19 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit e5fd74ffd341a3b2984f2812c16e1671495930a0
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 11 11:42:17 2020 +0200
Revert "compile: Run the load phase within 'with-target'."
Oh irony, this patch that fixes the cross-compilation result on the Hurd,
breaks cross-compiling to the Hurd.
It a cross-build environment
./pre-inst-env guix build --target=i586-pc-gnu guix --keep-failed
--no-offload
Doing:
GUILE_LOAD_COMPILED_PATH= guild compile --target=i586-pc-gnu -L .
gnu/ci.scm -o foo.go
GUILE_LOAD_COMPILED_PATH= guild compile --target=i586-pc-gnu -L .
gnu/tests/install.scm -o bar.go
Give something like:
WARNING: Use of `load' in declarative module (guix ui). Add #:declarative?
#f to your define-module invocation.
WARNING: (guix build emacs-build-system): imported module (guix build
utils) overrides core binding `delete'
Backtrace:
In ice-9/boot-9.scm:
3297:17 19 (resolve-interface (gnu system install) #:select _ #:hide _
#:prefix _ #:renamer _ #:version _)
In ice-9/threads.scm:
390:8 18 (_ _)
In ice-9/boot-9.scm:
3223:13 17 (_)
In ice-9/threads.scm:
390:8 16 (_ _)
In ice-9/boot-9.scm:
3507:20 15 (_)
2806:4 14 (save-module-excursion #<procedure 7f6220dc7cc0 at
ice-9/boot-9.scm:3508:21 ()>)
3527:26 13 (_)
In unknown file:
12 (primitive-load-path "gnu/system/install" #<procedure
7f622318f7c0 at ice-9/boot-9.scm:3514:37 ()>)
In ice-9/eval.scm:
626:19 11 (_ #<directory (gnu system install) 7f6229b65780>)
173:47 10 (_ #(#(#<directory (gnu system install) 7f6229b65780>
#<<plain-file> name: "motd" content: "…>) …))
196:43 9 (_ #(#(#<directory (gnu system install) 7f6229b65780>
#<<plain-file> name: "motd" content: "…>) …))
293:34 8 (_ #(#(#(#<directory (gnu system install) 7f6229b65780>
#<<plain-file> name: "motd" conte…>) …) #))
619:8 7 (_ #(#(#(#<directory (gnu installer) 7f62248f3dc0>))
#<variable 7f621d5d75b0 value: #<gexp (be…> …))
626:19 6 (_ #(#(#(#<directory (gnu installer) 7f62248f3dc0>))
#<variable 7f621d5d75b0 value: #<gexp (be…> …))
159:9 5 (_ #(#(#(#<directory (guix discovery) 7f62339ee280>)
"/tmp/guix-build-guix-1.0.1-18.11fc384…" …) …))
In srfi/srfi-1.scm:
495:18 4 (fold-right #<procedure 7f621d786ca0 at ice-9/eval.scm:336:13
(a b)> () _ . _)
In ice-9/eval.scm:
293:34 3 (_ #(#(#(#(#(#(#(#<directory (guix discovery) 7f62339ee280>
("~^m\x18 " (. #) …) …)) …) …) …) …) …))
155:9 2 (_ #(#(#(#(#<directory (guix discovery) 7f62339ee280>)
"/tmp/guix-build-guix-1.0.1-18.11…" …) …) …))
In unknown file:
1 (lstat
"/tmp/guix-build-guix-1.0.1-18.11fc384.drv-0/source/gnu/../gnu/installer/~^m\x18
")
In ice-9/boot-9.scm:
1669:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1669:16: In procedure raise-exception:
In procedure lstat: No such file or directory:
"/tmp/guix-build-guix-1.0.1-18.11fc384.drv-0/source/gnu/../gnu/installer/~^m\x18
"
This reverts commit 041c3c22dc14d485ca58b3ae1436b62d4a39d0aa.
---
guix/build/compile.scm | 51 +++++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/guix/build/compile.scm b/guix/build/compile.scm
index 3ce0ece..4b64727 100644
--- a/guix/build/compile.scm
+++ b/guix/build/compile.scm
@@ -184,35 +184,36 @@ files are for HOST, a GNU triplet such as
\"x86_64-linux-gnu\"."
;; Exit as soon as something goes wrong.
(exit-on-exception
file
- (let ((relative (relative-file source-directory file)))
- (compile-file file
- #:output-file (string-append build-directory "/"
- (scm->go relative))
- #:opts (append warning-options
- (optimization-options relative))))))
+ (with-target host
+ (lambda ()
+ (let ((relative (relative-file source-directory file)))
+ (compile-file file
+ #:output-file (string-append build-directory "/"
+ (scm->go relative))
+ #:opts (append warning-options
+ (optimization-options relative))))))))
(with-augmented-search-path %load-path source-directory
(with-augmented-search-path %load-compiled-path build-directory
(with-fluids ((*current-warning-prefix* ""))
- (with-target host
- (lambda ()
- ;; FIXME: To work around <https://bugs.gnu.org/15602>, we first
- ;; load all of FILES.
- (load-files source-directory files
- #:report-load report-load
- #:debug-port debug-port)
-
- ;; Make sure compilation related modules are loaded before
- ;; starting to compile files in parallel.
- (compile #f)
-
- ;; XXX: Don't use too many workers to work around the insane
- ;; memory requirements of the compiler in Guile 2.2.2:
- ;;
<https://lists.gnu.org/archive/html/guile-devel/2017-05/msg00033.html>.
- (n-par-for-each (min workers 8) build files)
-
- (unless (zero? total)
- (report-compilation #f total total))))))))
+
+ ;; FIXME: To work around <https://bugs.gnu.org/15602>, we first load
all
+ ;; of FILES.
+ (load-files source-directory files
+ #:report-load report-load
+ #:debug-port debug-port)
+
+ ;; Make sure compilation related modules are loaded before starting to
+ ;; compile files in parallel.
+ (compile #f)
+
+ ;; XXX: Don't use too many workers to work around the insane memory
+ ;; requirements of the compiler in Guile 2.2.2:
+ ;;
<https://lists.gnu.org/archive/html/guile-devel/2017-05/msg00033.html>.
+ (n-par-for-each (min workers 8) build files)
+
+ (unless (zero? total)
+ (report-compilation #f total total))))))
(eval-when (eval load)
(when (and (string=? "2" (major-version))
- 48/48: gnu: guix: Run `make update-guix-package'., (continued)
- 48/48: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/19
- 10/48: system: hurd: Add /etc/group., guix-commits, 2020/04/19
- 09/48: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/19
- 16/48: services: Add hurd-console-service-type., guix-commits, 2020/04/19
- 24/48: HACK use uncompiled .scm for shepherd, guix-commits, 2020/04/19
- 33/48: gnu: cmake: Remove "libuv" dependency for the Hurd., guix-commits, 2020/04/19
- 41/48: gnu: guix: Cross-build fix: override compressors., guix-commits, 2020/04/19
- 23/48: system: hurd: Add the Shepherd., guix-commits, 2020/04/19
- 27/48: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/19
- 40/48: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/19
- 45/48: Revert "compile: Run the load phase within 'with-target'.",
guix-commits <=