From 5fc42861048f03df2dc61fd74f3dd231346eab1d Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 27 Aug 2026 20:48:54 +0200 Subject: gnu: musl-boot: Don't use the gcc wrapper. This makes `hello-mesboot-2.10` build in real RISC-V hardware. * gnu/packages/commencement.scm (musl-boot): Disable the wrapper. Add `--disable-shared`. (gcc-mesboot-10, gcc-muslboot): Remove CC=musl-gcc and use gcc instead. --- gnu/packages/commencement.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 78ea2b535ea..3965840184b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2022, 2024 Ricardo Wurmus -;;; Copyright © 2022-2024 Ekaitz Zarraga +;;; Copyright © 2022-2026 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -2040,8 +2040,8 @@ ac_cv_c_float_format='IEEE (little-endian)' "/bin/sh") (string-append "--syslibdir=" #$output "/lib") "CC=gcc" - "--enable-gcc-wrapper")) - ((#:phases phases #~'%standard-phases) + "--disable-shared")) + #;((#:phases phases #~'%standard-phases) #~(modify-phases #$phases (delete 'remove-complex) (add-after 'install 'symlink-dynamic-linker @@ -2108,7 +2108,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (invoke "patch" "--force" "-p1" "-i" patch-file)))) (replace 'setenv (lambda _ - (setenv "CC" "musl-gcc") + (setenv "CC" "gcc") (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")))))))) (native-search-paths (list (search-path-specification @@ -2890,7 +2890,7 @@ exec " gcc "/bin/" program ; modular core/language downloads (add-after 'unpack 'setenv (lambda _ - (setenv "CC" "musl-gcc"))) + (setenv "CC" "gcc"))) #; (add-before 'configure 'configure-libiberty (lambda _ -- cgit v1.2.3