use cc-for-target

This commit is contained in:
Efraim Flashner 2021-04-26 21:38:45 +03:00
parent 67c7f8d467
commit 35719aae22
Signed by: efraim
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 8 additions and 6 deletions

View file

@ -1,4 +1,4 @@
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is an addendum to GNU Guix.
;;;
@ -19,6 +19,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages linux)
@ -650,14 +651,14 @@ supersymmetric 31ROT13.")
"04fciciykphswj12vwlbvii3sjcqqf2j6kiqynsg5n14qyghr6cl"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no test suite
`(#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'unpack)
(replace 'build
(lambda* (#:key source #:allow-other-keys)
(invoke "gcc" "-o" "mkzombie" source)))
(invoke ,(cc-for-target) "-o" "mkzombie" source)))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))

View file

@ -53,7 +53,7 @@
(source haiku-buildtools-source)
(build-system gnu-build-system)
(arguments
'(#:tests? #f
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(delete 'configure)
@ -64,9 +64,10 @@
#t))
(add-after 'change-directory 'patch-source
(lambda _
(setenv "CC" (which "gcc"))
(setenv "CC" ,(cc-for-target))
(substitute* "Makefile"
(("CC = cc") "CC = gcc"))
(("CC = cc")
(string-append "CC = " ,(cc-for-target))))
(substitute* "execunix.c"
(("# define USE_POSIX_SPAWN") ""))
(mkdir-p "bin.linuxx86")