[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/60: gnu: file-boot0: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
53/60: gnu: file-boot0: Fix building on riscv64-linux. |
Date: |
Sun, 24 Nov 2024 02:50:18 -0500 (EST) |
efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit cadfc52981124470a1972ef17450389a297088ce
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)))))
- 18/60: gnu: gcc-mesboot: Use commencement-build-target., (continued)
- 18/60: gnu: gcc-mesboot: Use commencement-build-target., guix-commits, 2024/11/24
- 22/60: gnu: tcc-boot: Support more architectures., guix-commits, 2024/11/24
- 25/60: gnu: Add tcc-boot-musl., guix-commits, 2024/11/24
- 34/60: gnu: gcc-core-mesboot1: Adjust for dependency changes., guix-commits, 2024/11/24
- 38/60: gnu: Add gcc-muslboot0., guix-commits, 2024/11/24
- 42/60: gnu: hello-mesboot: Add support for riscv64-linux., guix-commits, 2024/11/24
- 43/60: gnu: Add byacc-mesboot., guix-commits, 2024/11/24
- 46/60: gnu: Add mawk-mesboot., guix-commits, 2024/11/24
- 49/60: gnu: %boot-mesboot6-inputs: Adjust for riscv64-linux., guix-commits, 2024/11/24
- 48/60: gnu: mesboot-package: Adjust for riscv64-linux builds., guix-commits, 2024/11/24
- 53/60: gnu: file-boot0: Fix building on riscv64-linux.,
guix-commits <=
- 52/60: gnu: findutils-boot0: Adjust the skipped tests on riscv64-linux., guix-commits, 2024/11/24
- 21/60: gnu: tcc-boot0: Specify the build target., guix-commits, 2024/11/24
- 31/60: gnu: gmp-boot: Update and build package., guix-commits, 2024/11/24
- 32/60: gnu: mpfr-boot: Update and build package., guix-commits, 2024/11/24
- 37/60: gnu: gcc-mesboot: Adjust for changes in gcc-mesboot1., guix-commits, 2024/11/24
- 39/60: gnu: Add musl-boot., guix-commits, 2024/11/24
- 56/60: gnu: Add byacc-boot0., guix-commits, 2024/11/24
- 36/60: gnu: gcc-mesboot1: Adjust setting include paths., guix-commits, 2024/11/24
- 41/60: gnu: Add %boot-muslboot2-inputs., guix-commits, 2024/11/24
- 54/60: gnu: %boot0-inputs: Use newly built *-boot0 packages on riscv64-linux., guix-commits, 2024/11/24