nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: make-u-boot-package: Don't unnecessarily cross-compile. 

* gnu/packages/bootloaders.scm (make-u-boot-package)[native-inputs]: Only
use cross-gcc and cross-binutils if compiling for a different
architecture.
[arguments]: Only use cross compiling make-flags if cross compiling.
This commit is contained in:
Efraim Flashner 2017-08-06 00:13:06 +03:00
parent 18c6a7b4c8
commit 3bfee8ff02
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/bootloaders.scm
View File

@ -333,18 +333,26 @@ also initializes the boards (RAM etc).")
(define (make-u-boot-package board triplet) (define (make-u-boot-package board triplet)
"Returns a u-boot package for BOARD cross-compiled for TRIPLET." "Returns a u-boot package for BOARD cross-compiled for TRIPLET."
(let ((same-arch? (if (string-prefix? (%current-system) triplet)
`#t
`#f)))
(package (package
(inherit u-boot) (inherit u-boot)
(name (string-append "u-boot-" (string-downcase board))) (name (string-append "u-boot-" (string-downcase board)))
(native-inputs (native-inputs
`(,@(if (not same-arch?)
`(("cross-gcc" ,(cross-gcc triplet)) `(("cross-gcc" ,(cross-gcc triplet))
("cross-binutils" ,(cross-binutils triplet)) ("cross-binutils" ,(cross-binutils triplet)))
'())
,@(package-native-inputs u-boot))) ,@(package-native-inputs u-boot)))
(arguments (arguments
`(#:modules ((ice-9 ftw) (guix build utils) (guix build gnu-build-system)) `(#:modules ((ice-9 ftw) (guix build utils) (guix build gnu-build-system))
#:test-target "test" #:test-target "test"
#:make-flags #:make-flags
(list "HOSTCC=gcc" (string-append "CROSS_COMPILE=" ,triplet "-")) (list "HOSTCC=gcc"
,@(if (not same-arch?)
`((string-append "CROSS_COMPILE=" ,triplet "-"))
'()))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -374,7 +382,7 @@ also initializes the boards (RAM etc).")
(let ((target-file (string-append libexec "/" file))) (let ((target-file (string-append libexec "/" file)))
(mkdir-p (dirname target-file)) (mkdir-p (dirname target-file))
(copy-file file target-file))) (copy-file file target-file)))
uboot-files))))))))) uboot-files))))))))))
(define-public u-boot-vexpress (define-public u-boot-vexpress
(make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf")) (make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf"))