[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/85: gnu: file-boot0: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
53/85: gnu: file-boot0: Fix building on riscv64-linux. |
Date: |
Tue, 17 Dec 2024 04:08:11 -0500 (EST) |
efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit b970c05b241ab57a126961e3dbdcb0320a11d63d
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 051b40bdf8..28e5138f39 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)))))
- 41/85: gnu: Add %boot-muslboot2-inputs., (continued)
- 41/85: gnu: Add %boot-muslboot2-inputs., guix-commits, 2024/12/17
- 46/85: gnu: Add mawk-mesboot., guix-commits, 2024/12/17
- 63/85: fixup gnu: musl-boot0: Improve the install phase., guix-commits, 2024/12/17
- 74/85: fixup musl-boot, guix-commits, 2024/12/17
- 70/85: gnu: binutils-muslboot0: Don't compress the documentation., guix-commits, 2024/12/17
- 57/85: gnu: gawk-boot0: Remove pre-generated source file., guix-commits, 2024/12/17
- 58/85: gnu: ed: Update to 1.20.2., guix-commits, 2024/12/17
- 40/85: gnu: Add gcc-muslboot., guix-commits, 2024/12/17
- 26/85: gnu: Add tcc-musl., guix-commits, 2024/12/17
- 29/85: gnu: Add %boot-tcc-musl-inputs., guix-commits, 2024/12/17
- 53/85: gnu: file-boot0: Fix building on riscv64-linux.,
guix-commits <=
- 42/85: gnu: hello-mesboot: Add support for riscv64-linux., guix-commits, 2024/12/17
- 49/85: gnu: %boot-mesboot6-inputs: Adjust for riscv64-linux., guix-commits, 2024/12/17
- 52/85: gnu: findutils-boot0: Adjust the skipped tests on riscv64-linux., guix-commits, 2024/12/17
- 59/85: gnu: glibc-headers-mesboot: Remove unused C macro., guix-commits, 2024/12/17
- 65/85: gnu: tcc-musl: Update build flags for multiple architectures., guix-commits, 2024/12/17
- 69/85: gnu: binutils-muslboot0: Correct package inputs., guix-commits, 2024/12/17
- 23/85: gnu: tcc-boot: Update to 0.9.27.1139-8cd21e9., guix-commits, 2024/12/17
- 51/85: gnu: gnu-make-boot0: Adjust configure-flags on riscv64-linux., guix-commits, 2024/12/17
- 54/85: gnu: %boot0-inputs: Use newly built *-boot0 packages on riscv64-linux., guix-commits, 2024/12/17
- 75/85: fixup mpc-boot, guix-commits, 2024/12/17