From 6450070b9197516f84ff15d8c8653544ea1fb119 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 6 Oct 2020 09:44:25 +0300 Subject: gnu: vlang: Use cc-for-target. * gnu/packages/vlang.scm (vlang)[arguments]: Don't hardcode gcc in make-flags. In custom 'patch-makefile, don't hardcode gcc. --- gnu/packages/vlang.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index 6f6aa79ce5..659f9e01c7 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages)) (define-public vlang @@ -43,15 +45,15 @@ (base32 "1rqi7cah5nq8aggrib9xvdpfjxq20li91svv0w9yny6nn1ag7snx")))) (build-system gnu-build-system) (arguments - '(#:make-flags - `("CC=gcc" - "TMPTCC=tcc" - ,(string-append "VC=" (assoc-ref %build-inputs "vc")) - "GITCLEANPULL=true" - "GITFASTCLONE=mkdir -p" - "TCCREPO=" - "VCREPO=" - "VERBOSE=1") + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + "TMPTCC=tcc" + (string-append "VC=" (assoc-ref %build-inputs "vc")) + "GITCLEANPULL=true" + "GITFASTCLONE=mkdir -p" + "TCCREPO=" + "VCREPO=" + "VERBOSE=1") #:phases (modify-phases %standard-phases (delete 'configure) @@ -59,7 +61,7 @@ (lambda _ (substitute* "Makefile" (("rm -rf") "true") - (("v self") "v -cc gcc cmd/v")) + (("v self") (string-append "v -cc " ,(cc-for-target) " cmd/v"))) #t)) (add-before 'check 'delete-failing-tests ;; XXX As always, these should eventually be fixed and run. -- cgit v1.2.3