diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-24 17:28:11 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-24 17:28:11 +0200 |
| commit | c57d649de380da890f296428b85564cbc527bbad (patch) | |
| tree | 79e9c0b5407aea91c421f7004a0da7bb1e207ba4 /guix | |
| parent | 69c2e0103ab64aa6e0beb7651797de9cfd22a6d7 (diff) | |
| parent | 9b42918edd3f7e9d505c874d3947c0a0815fe551 (diff) | |
| download | patches-c57d649de380da890f296428b85564cbc527bbad.tar patches-c57d649de380da890f296428b85564cbc527bbad.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/compile.scm | 9 | ||||
| -rw-r--r-- | guix/git-download.scm | 4 | ||||
| -rw-r--r-- | guix/scripts/package.scm | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/guix/build/compile.scm b/guix/build/compile.scm index 3ce0ecede5..c4dbb6e34c 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -194,6 +194,11 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"." (with-augmented-search-path %load-path source-directory (with-augmented-search-path %load-compiled-path build-directory (with-fluids ((*current-warning-prefix* "")) + ;; Make sure the compiler's modules are loaded before 'with-target' + ;; (since 'with-target' influences the .go loader), and before + ;; starting to compile files in parallel. + (compile #f) + (with-target host (lambda () ;; FIXME: To work around <https://bugs.gnu.org/15602>, we first @@ -202,10 +207,6 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"." #: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>. diff --git a/guix/git-download.scm b/guix/git-download.scm index ef0bb2e281..a1c1adf760 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -179,7 +179,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." ;; can happen, for example, when the user swapped the revision and commit ;; arguments by mistake. (when (< (string-length commit) 7) - (error "git-version: commit ID unexpectedly short")) + (raise + (condition + (&message (message "git-version: commit ID unexpectedly short"))))) (string-append version "-" revision "." (string-take commit 7))) (define (git-file-name name version) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 43a3bb2825..dce9256bf5 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -61,6 +61,8 @@ delete-matching-generations guix-package + search-path-environment-variables + transaction-upgrade-entry ;mostly for testing (%options . %package-options) |