me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Efraim Flashner 2020-10-06 09:44:25 +03:00
parent 34d1c0a03b
commit 6450070b91
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/vlang.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -26,6 +27,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)) #:use-module (guix packages))
(define-public vlang (define-public vlang
@ -43,15 +45,15 @@
(base32 "1rqi7cah5nq8aggrib9xvdpfjxq20li91svv0w9yny6nn1ag7snx")))) (base32 "1rqi7cah5nq8aggrib9xvdpfjxq20li91svv0w9yny6nn1ag7snx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags `(#:make-flags
`("CC=gcc" (list (string-append "CC=" ,(cc-for-target))
"TMPTCC=tcc" "TMPTCC=tcc"
,(string-append "VC=" (assoc-ref %build-inputs "vc")) (string-append "VC=" (assoc-ref %build-inputs "vc"))
"GITCLEANPULL=true" "GITCLEANPULL=true"
"GITFASTCLONE=mkdir -p" "GITFASTCLONE=mkdir -p"
"TCCREPO=" "TCCREPO="
"VCREPO=" "VCREPO="
"VERBOSE=1") "VERBOSE=1")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -59,7 +61,7 @@
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("rm -rf") "true") (("rm -rf") "true")
(("v self") "v -cc gcc cmd/v")) (("v self") (string-append "v -cc " ,(cc-for-target) " cmd/v")))
#t)) #t))
(add-before 'check 'delete-failing-tests (add-before 'check 'delete-failing-tests
;; XXX As always, these should eventually be fixed and run. ;; XXX As always, these should eventually be fixed and run.