mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

draft: gcc-core-mesboot1: adjust for aarch64-linux

Browse source 
(%current-system) evaluated too early
use correct dynamic-linker
parameterize architecture in path
This commit is contained in:
Efraim Flashner 2022-12-13 14:04:41 +02:00
parent dac195c8f1
commit 7966084069
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/commencement.scm
View file

@ -1443,11 +1443,6 @@ (define gcc-core-mesboot1
;; stricly needed, but very helpful for development because it builds
;; relatively fast. If this configures and builds then gcc-mesboot1 also
;; builds.
(let ((triplet (match (%current-system)
((or "armhf-linux" "aarch64-linux")
"arm-unknown-linux-gnu")
((or "i686-linux" "x86_64-linux")
"i686-unknown-linux-gnu"))))
(package
(inherit gcc-mesboot0)
(name "gcc-core-mesboot1")
@ -1466,6 +1461,11 @@ (define gcc-core-mesboot1
("mpc-source" ,mpc-boot)))
(native-inputs (%boot-mesboot1-inputs))
(arguments
(let ((triplet (match (%current-system)
((or "armhf-linux" "aarch64-linux")
"arm-unknown-linux-gnu")
((or "i686-linux" "x86_64-linux")
"i686-unknown-linux-gnu"))))
(list #:implicit-inputs? #f
#:guile %bootstrap-guile
#:tests? #f
@ -1479,7 +1479,11 @@ (define gcc-core-mesboot1
"-B" libc "/lib "
"-Wl,-dynamic-linker "
"-Wl," libc
#$(glibc-dynamic-linker "i686-linux"))))
(match #$triplet
("i686-unknown-linux-gnu"
#$(glibc-dynamic-linker "i686-linux"))
("arm-unknown-linux-gnu"
#$(glibc-dynamic-linker "armhf-linux"))))))
(list (string-append "LDFLAGS=" ldflags)
(string-append "LDFLAGS_FOR_TARGET=" ldflags)))
#:configure-flags
@ -1561,7 +1565,7 @@ (define gcc-core-mesboot1
(kernel-headers (assoc-ref %build-inputs "kernel-headers")))
(setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
(setenv "C_INCLUDE_PATH" (string-append
gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"
gcc "/lib/gcc-lib/" #$triplet "/2.95.3/include"
":" kernel-headers "/include"
":" glibc "/include"
":" (getcwd) "/mpfr/src"))