guix_mirror_bot pushed a commit to branch wip-riscv-bootstrap in repository guix.
commit db01b0aee2733f852c24e70226944d0b561b0c7e Author: Efraim Flashner <[email protected]> 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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4f6182cab8..cbdadf839b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2836,8 +2836,11 @@ exec " gcc "/bin/" program (inherit (@ (gnu packages file) file)) (arguments `(#:configure-flags - ;; XXX: List only added to prevent rebuilds! - `("--disable-bzlib" ,,@'()))))) + `("--disable-bzlib" + ,,@(match (%current-system) + ("riscv64-linux" + '("--disable-xzlib")) + (_ '()))))))) (define file-boot0 (package @@ -2852,7 +2855,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)))))
