[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
93/94: gnu: file-boot0: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
93/94: gnu: file-boot0: Fix building on riscv64-linux. |
Date: |
Mon, 21 Oct 2024 08:40:55 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 0e2e3ba1a5579d405deaa3326cd9138d931357b0
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Oct 21 15:01:26 2024 +0300
gnu: file-boot0: Fix building on riscv64-linux.
* gnu/packages/commencement.scm (file)[configure-flags]: When building
for riscv64-linux disable the use of xz.
(file-boot0)[arguments]: When building for riscv64-linux adjust the
make-flags to pass a different CFLAG to build for C11.
Change-Id: I3c8a3f6882fd5c7dce7ba43785a1f1548fa984cb
---
gnu/packages/commencement.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 62de8e60d3..a0bdbbdeca 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2791,6 +2791,8 @@ exec " gcc "/bin/" program
,,@(match (%current-system)
((or "arm-linux" "aarch64-linux")
'("--disable-dependency-tracking"))
+ ("riscv64-linux"
+ '("--disable-xzlib"))
(_ '())))))))
(define file-boot0
@@ -2806,7 +2808,10 @@ exec " gcc "/bin/" program
#:implicit-inputs? #f
#:guile ,%bootstrap-guile
#:configure-flags '("--disable-bzlib")
- #:make-flags '("CFLAGS+=-std=c11")
+ ;; riscv64's gcc-4.6.4 doesn't have full C11 support.
+ #:make-flags ,(if (target-riscv64?)
+ ''("CFLAGS+=-std=c1x")
+ ''("CFLAGS+=-std=c11"))
#:strip-binaries? #f
#:validate-runpath? #f
,@(package-arguments file)))))
- 38/94: gnu: Add tcc-boot-musl., (continued)
- 38/94: gnu: Add tcc-boot-musl., guix-commits, 2024/10/21
- 24/94: gnu: glibc-headers-mesboot: Use commencement-build-target., guix-commits, 2024/10/21
- 54/94: fixup binutils-muslboot0, guix-commits, 2024/10/21
- 47/94: Add oksh-muslboot0., guix-commits, 2024/10/21
- 59/94: fixup m4-boot, guix-commits, 2024/10/21
- 73/94: gnu: gcc-core-mesboot1: Adjust for dependency changes., guix-commits, 2024/10/21
- 67/94: fixup mpfr-boot, guix-commits, 2024/10/21
- 76/94: gnu: gcc-mesboot: Adjust for changes in gcc-mesboot1., guix-commits, 2024/10/21
- 91/94: gnu: gnu-make-boot0: Adjust configure-flags on riscv64-linux., guix-commits, 2024/10/21
- 85/94: gnu: gawk-mesboot: Remove pre-generated source file., guix-commits, 2024/10/21
- 93/94: gnu: file-boot0: Fix building on riscv64-linux.,
guix-commits <=
- 77/94: gnu: Add gcc-muslboot0., guix-commits, 2024/10/21
- 71/94: fixup mpc-boot, guix-commits, 2024/10/21
- 75/94: gnu: gcc-mesboot1: Adjust setting include paths., guix-commits, 2024/10/21
- 78/94: fixup gcc-muslboot0, guix-commits, 2024/10/21
- 79/94: gnu: Add musl-boot., guix-commits, 2024/10/21
- 66/94: fixup mpfr-boot, guix-commits, 2024/10/21
- 21/94: gnu: binutils-mesboot1: Use commencement-build-target., guix-commits, 2024/10/21
- 03/94: gnu: mes-boot: Update to 0.27., guix-commits, 2024/10/21
- 10/94: gnu: mes-boot: Use commencement-build-target., guix-commits, 2024/10/21
- 16/94: squash patch-mesboot, guix-commits, 2024/10/21