guix-patches
[Top][All Lists]
Advanced

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

[bug#60224] [PATCH v3 04/11] gnu: make-u-boot-package: Allow disabling c


From: Maxim Cournoyer
Subject: [bug#60224] [PATCH v3 04/11] gnu: make-u-boot-package: Allow disabling cross-compilation.
Date: Sun, 1 Jan 2023 19:46:29 -0500

* gnu/packages/bootloaders.scm (make-u-boot-package): Accept #f for the
TRIPLET argument to disable cross-compilation.  Update doc.
---

(no changes since v1)

 gnu/packages/bootloaders.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index c3c15d557a..1a4415b858 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -859,14 +859,16 @@ (define*-public (make-u-boot-package board triplet
                                      (u-boot u-boot))
   "Return a U-Boot package for BOARD cross-compiled for TRIPLET with the
 optional DEFCONFIG file and optional configuration changes from CONFIGS.
-NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is
-appended to the package description.  U-BOOT can be used when a fork or a
-different version of U-Boot must be used."
+TRIPLET may also be set to #f to disable cross-compilation.  NAME-SUFFIX is
+appended to the package name, while APPEND-DESCRIPTION is appended to the
+package description.  U-BOOT can be used when a fork or a different version of
+U-Boot must be used."
   (let ((native-build? (lambda ()
                          ;; Note: %current-system is a *triplet*, unlike its
                          ;; name would suggest.
-                         (string=? (%current-system)
-                                   (gnu-triplet->nix-system triplet)))))
+                         (or (not triplet) ;disable cross-compilation
+                             (string=? (%current-system)
+                                       (gnu-triplet->nix-system triplet))))))
     (package
       (inherit u-boot)
       (name (string-append "u-boot-"
-- 
2.38.1






reply via email to

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