branch master updated: gnu: b43-tools: Use make-flags.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e82b700228 gnu: b43-tools: Use make-flags.
e82b700228 is described below

commit e82b700228debd37a1cb1aff2d23d56f8d2e5768
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Oct 31 17:22:49 2023 +0200

    gnu: b43-tools: Use make-flags.
    
    * gnu/packages/firmware.scm (b43-tools)[arguments]: Add make-flags.
    Use make-flags in custom 'build and 'install phases.  Remove trailing #t
    from phases.
    
    Change-Id: I8576351ecd571d191598943a2d143ab3e3e9da09
---
 gnu/packages/firmware.scm | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 0e638acfae..294bbea184 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -175,6 +175,8 @@ Linux-libre.")
                     (guix build gnu-build-system)
                     (guix build utils))
          #:tests? #f                    ; no tests
+         #:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
+                        ,(string-append "CC=" ,(cc-for-target)))
          #:phases
          (let ((subdirs '("assembler" "disassembler")))
            (modify-phases %standard-phases
@@ -182,24 +184,19 @@ Linux-libre.")
              (add-before 'build 'patch-/bin/true
                (lambda _
                  (substitute* (find-files "." "Makefile")
-                   (("/bin/true") ":"))
-                 #t))
+                   (("/bin/true") ":"))))
              (replace 'build
-               (lambda _
+               (lambda* (#:key (make-flags '()) #:allow-other-keys)
                  (for-each (lambda (dir)
-                             (invoke "make" "-C" dir "CC=gcc"))
-                           subdirs)
-                 #t))
+                             (apply invoke "make" "-C" dir make-flags))
+                           subdirs)))
              (replace 'install
-               (lambda* (#:key outputs #:allow-other-keys)
+               (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
                  (let ((out (assoc-ref outputs "out")))
                    (mkdir-p (string-append out "/bin"))
                    (for-each (lambda (dir)
-                               (invoke "make" "-C" dir
-                                       (string-append "PREFIX=" out)
-                                       "install"))
-                             subdirs)
-                   #t)))))))
+                               (apply invoke "make" "-C" dir "install" 
make-flags))
+                             subdirs))))))))
       (home-page
        "https://bues.ch/cms/hacking/misc.html#linux_b43_driver_firmware_tools";)
       (synopsis "Collection of tools for the b43 wireless driver")