sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5327 from PastaPastaPasta/fix-guix-aarch64

Browse Source 
backport: Merge 25861
This commit is contained in:
PastaPastaPasta 2023-04-16 12:08:08 -05:00 committed by GitHub
commit 7a4383bda7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/guix/manifest.scm
View File

@ -80,6 +80,11 @@ http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
(("-rpath=") "-rpath-link=")) (("-rpath=") "-rpath-link="))
#t)))))))) #t))))))))
(define building-on (string-append (list-ref (string-split (%current-system) #\-) 0) "-guix-linux-gnu"))
(define (explicit-cross-configure package)
(package-with-extra-configure-variable package "--build" building-on))
(define (make-cross-toolchain target (define (make-cross-toolchain target
base-gcc-for-libc base-gcc-for-libc
base-kernel-headers base-kernel-headers
@ -89,9 +94,9 @@ http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
(let* ((xbinutils (cross-binutils target)) (let* ((xbinutils (cross-binutils target))
;; 1. Build a cross-compiling gcc without targeting any libc, derived ;; 1. Build a cross-compiling gcc without targeting any libc, derived
;; from BASE-GCC-FOR-LIBC ;; from BASE-GCC-FOR-LIBC
(xgcc-sans-libc (cross-gcc target (xgcc-sans-libc (explicit-cross-configure (cross-gcc target
#:xgcc base-gcc-for-libc #:xgcc base-gcc-for-libc
#:xbinutils xbinutils)) #:xbinutils xbinutils)))
;; 2. Build cross-compiled kernel headers with XGCC-SANS-LIBC, derived ;; 2. Build cross-compiled kernel headers with XGCC-SANS-LIBC, derived
;; from BASE-KERNEL-HEADERS ;; from BASE-KERNEL-HEADERS
(xkernel (cross-kernel-headers target (xkernel (cross-kernel-headers target
@ -100,17 +105,17 @@ http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
xbinutils)) xbinutils))
;; 3. Build a cross-compiled libc with XGCC-SANS-LIBC and XKERNEL, ;; 3. Build a cross-compiled libc with XGCC-SANS-LIBC and XKERNEL,
;; derived from BASE-LIBC ;; derived from BASE-LIBC
(xlibc (cross-libc target (xlibc (explicit-cross-configure (cross-libc target
base-libc base-libc
xgcc-sans-libc xgcc-sans-libc
xbinutils xbinutils
xkernel)) xkernel)))
;; 4. Build a cross-compiling gcc targeting XLIBC, derived from ;; 4. Build a cross-compiling gcc targeting XLIBC, derived from
;; BASE-GCC ;; BASE-GCC
(xgcc (cross-gcc target (xgcc (explicit-cross-configure (cross-gcc target
#:xgcc base-gcc #:xgcc base-gcc
#:xbinutils xbinutils #:xbinutils xbinutils
#:libc xlibc))) #:libc xlibc))))
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and ;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and
;; XGCC ;; XGCC
(package (package