From 1ca44ae34cb4324427f232035b00c11dfa712139 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Thu, 28 May 2020 18:57:46 +0200
Subject: gnu: Use 'cc-for-target' instead of custom implementations.

* gnu/packages/compression.scm (ecm)[arguments]: In #:make-flags, remove
TARGET binding and use CC-FOR-TARGET instead.
* gnu/packages/linux.scm (powerstat, crda, cachefilesd)[arguments]: Likewise.
* gnu/packages/mail.scm (alpine)[arguments]: Likewise.
* gnu/packages/music.scm (lsp-plugins)[arguments]: Likewise.
* gnu/packages/radio.scm (dump1090)[arguments]: Likewise.
* gnu/packages/suckless.scm (blind, dmenu, spoon, slock, st, surf, sent,
wificurse, sbm, prout, noice, human, fortify-headers, colors, libutf,
scron)[arguments]: Likewise.
---
 gnu/packages/linux.scm | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'gnu/packages/linux.scm')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b159ff7b22..0a154fd6cc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1222,11 +1222,8 @@ at login.  Local and dynamic reconfiguration are its key features.")
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-       (let* ((target ,(%current-target-system)))
-         (list (string-append "CC=" (if target
-                                        (string-append target "-gcc")
-                                        "gcc"))
-               (string-append "prefix=" (assoc-ref %outputs "out"))))
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "prefix=" (assoc-ref %outputs "out")))
        #:tests? #f                      ; no test suite
        #:phases
        (modify-phases %standard-phases
@@ -3377,12 +3374,9 @@ interface.")
                        #t))))
        #:test-target "verify"
        #:make-flags (let ((out     (assoc-ref %outputs "out"))
-                          (regdb   (assoc-ref %build-inputs "wireless-regdb"))
-                          (target ,(%current-target-system)))
+                          (regdb   (assoc-ref %build-inputs "wireless-regdb")))
                       (list
-                       (string-append
-                        "CC=" (if target
-                                  (string-append target "-gcc") "gcc"))
+                       (string-append "CC=" ,(cc-for-target))
                        "V=1"
 
                        ;; Disable signature-checking on 'regulatory.bin'.
@@ -7040,12 +7034,8 @@ system boot process.")
      `(#:tests? #f ; there are no tests
        #:make-flags
        (let ((prefix-dir (lambda (var dir)
-                           (string-append var "=" %output "/" dir)))
-             (target ,(%current-target-system)))
-         (list (string-append "CC="
-                              (if target
-                                  (string-append target "-gcc")
-                                  "gcc"))
+                           (string-append var "=" %output "/" dir))))
+         (list (string-append "CC=" ,(cc-for-target))
                (prefix-dir "SBINDIR" "sbin/")
                (prefix-dir "ETCDIR" "etc/")
                (prefix-dir "MANDIR" "share/man/")))
-- 
cgit v1.2.3