guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu: dump1090: Don't hard-code CC=gcc.


From: guix-commits
Subject: 03/03: gnu: dump1090: Don't hard-code CC=gcc.
Date: Thu, 14 May 2020 11:19:01 -0400 (EDT)

glv pushed a commit to branch master
in repository guix.

commit 19e8a754181e78acde3ee8e0d201d4fe02d604f9
Author: Guillaume Le Vaillant <address@hidden>
AuthorDate: Thu May 14 17:12:54 2020 +0200

    gnu: dump1090: Don't hard-code CC=gcc.
    
    * gnu/packages/radio.scm (dump1090)[arguments]: Add 'make-flags' field to 
set
      'CC' to the right compiler, remove 'configure' phase.
---
 gnu/packages/radio.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index cbfb068..123357a 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1016,13 +1016,15 @@ gain and standing wave ratio.")
        ("rtl-sdr" ,rtl-sdr)))
     (arguments
      `(#:test-target "test"
+       #:make-flags
+       (let ((target ,(%current-target-system)))
+         (list (string-append "CC=" (if target
+                                        (string-append target "-gcc")
+                                        "gcc"))
+               "BLADERF=no"))
        #:phases
        (modify-phases %standard-phases
-         (replace 'configure
-           (lambda _
-             (setenv "CC" "gcc")
-             (setenv "BLADERF" "no")
-             #t))
+         (delete 'configure)
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))



reply via email to

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