efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 3ebb10c19c98e772e7cf5d18cdc8f0e4821d61e8
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Sun Oct 6 14:20:10 2024 +0300
WIP on tcc-musl
Change-Id: I3109d4fc06e86e6c44e6667250a1924fe89ce7a8
---
gnu/packages/commencement.scm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 544a3e2546..b8e0c729b8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1069,10 +1069,9 @@ MesCC-Tools), and finally M2-Planet.")
#~(modify-phases #$phases
(replace 'build
(lambda* (#:key outputs inputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (libc (assoc-ref inputs "libc"))
- (tcc (assoc-ref inputs "tcc"))
- (interpreter "/musl/loader"))
+ (let ((out (assoc-ref outputs "out"))
+ (libc (assoc-ref inputs "libc"))
+ (interpreter "/musl/loader"))
(invoke
"tcc"
"-g"
@@ -1080,9 +1079,6 @@ MesCC-Tools), and finally M2-Planet.")
"-D" "REG_PC=0"
"-D" "REG_S0=8"
"-D" "ONE_SOURCE=1"
- "-I" (string-append tcc "/include")
- "-L" (string-append tcc "/lib")
- ;"-D" (string-append "TCC_TARGET_" (string-upcase
#$(tcc-system)) "=1")
"-D" "TCC_VERSION=\"0.9.28rc\""
"-D" "CONFIG_TCC_STATIC=1"
"-D" "CONFIG_USE_LIBGCC=1"
@@ -1092,11 +1088,13 @@ MesCC-Tools), and finally M2-Planet.")
"-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter
"\"")
"-D" (string-append "CONFIG_TCC_LIBPATHS=\"" libc "/lib:"
out "/lib:"
- "{B}/lib:.\"")
+ "{B}:.\"")
"-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\""
libc "/include:"
out "/include:"
- "{B}/include\"")
+ ;"{B}/include\""
+ "\""
+ )
"-D" (string-append "TCC_LIBGCC=\"" libc "/lib/libc.a\"")
"-o" "tcc"
"tcc.c"))))))))))
