me
/
guix
Archived
1
0
Fork 0
Code

gnu: gcc: Patch gcc for riscv unconditionally. 

* gnu/packages/gcc.scm (gcc-4.7)[arguments]: In custom 'pre-configure
phase unconditionally remove STARTFILE_PREFIX_SPEC in all locations it
may exist.
master
Efraim Flashner 2022-07-10 08:44:55 +03:00
parent 1ed0283fcc
commit 7476a910a1
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gcc.scm
View File

@ -295,15 +295,13 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(substitute* "gcc/config/aarch64/t-aarch64-linux"
(("lib64") "lib")))
;; TODO: Make this unconditional in core-updates.
;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
;; gcc:lib output, which causes ld to not find -lgcc_s.
,@(if (target-riscv64?)
`((when (file-exists? "gcc/config/riscv")
(substitute* "gcc/config/riscv/linux.h"
(("define STARTFILE_PREFIX_SPEC")
"define __STARTFILE_PREFIX_SPEC"))))
'())
(when (file-exists? "gcc/config/riscv")
(substitute* '("gcc/config/riscv/linux.h"
"gcc/config/riscv/riscv.h") ; GCC < 10
(("define STARTFILE_PREFIX_SPEC")
"define __STARTFILE_PREFIX_SPEC")))
(when (file-exists? "libbacktrace")
;; GCC 4.8+ comes with libbacktrace. By default it builds