guix-commits
[Top][All Lists]
Advanced

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

05/13: gnu: make-u-boot-package: Allow disabling cross-compilation.


From: guix-commits
Subject: 05/13: gnu: make-u-boot-package: Allow disabling cross-compilation.
Date: Wed, 18 Jan 2023 21:08:32 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 980abad24d0b4a9a77c829016aa7dc0a5ac4f5bc
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Dec 20 14:03:47 2022 -0500

    gnu: make-u-boot-package: Allow disabling cross-compilation.
    
    * gnu/packages/bootloaders.scm (make-u-boot-package): Accept #f for the
    TRIPLET argument to disable cross-compilation.  Update doc.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 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 b7a31c8b48..290d832a83 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -860,12 +860,14 @@ def test_ctrl_c"))
                                      (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 ()
-                         (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-"



reply via email to

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