ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-03 18:09:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust-bootstrap: Fix building on riscv64-linux.

Browse source 
* gnu/packages/rust-bootstrap.scm [properties]: Increase timeout to 36
hours.
[inputs]: When building for riscv64 add clang-13.
[arguments]: When building for riscv64 start the build using clang and
then switch to gcc later.

Change-Id: I661934ff6862e5c8d826dd637ceeaf316b877c23
This commit is contained in:
Efraim Flashner 2024-01-17 10:13:45 +02:00
parent 6302731750
commit f8f8bd9eba
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/rust.scm
View file

@ -178,11 +178,12 @@ (define-public rust-bootstrap
(patch-flags '("-p0")))) ;default is -p1 (patch-flags '("-p0")))) ;default is -p1
(outputs '("out" "cargo")) (outputs '("out" "cargo"))
(properties '((hidden? . #t) (properties '((hidden? . #t)
(timeout . 72000) ;20 hours (timeout . 129600) ;36 hours
(max-silent-time . 18000))) ;5 hours (for armel) (max-silent-time . 18000))) ;5 hours (for armel)
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(,@(if (target-ppc64le?) `(,@(if (or (target-ppc64le?)
(target-riscv64?))
`(("clang" ,clang-13)) `(("clang" ,clang-13))
`()) `())
("llvm" ,llvm-13) ("llvm" ,llvm-13)
@ -288,7 +289,8 @@ (define-public rust-bootstrap
(setenv "CARGO_HOME" cargo-home)))) (setenv "CARGO_HOME" cargo-home))))
(replace 'configure (replace 'configure
(lambda _ (lambda _
,@(if (target-ppc64le?) ,@(if (or (target-ppc64le?)
(target-riscv64?))
`((setenv "CC" "clang") `((setenv "CC" "clang")
(setenv "CXX" "clang++")) (setenv "CXX" "clang++"))
`((setenv "CC" "gcc") `((setenv "CC" "gcc")
@ -332,7 +334,8 @@ (define-public rust-bootstrap
;; We can to continue the build with gcc after building rustc. ;; We can to continue the build with gcc after building rustc.
;; librustc_driver.so undefined reference to ;; librustc_driver.so undefined reference to
;; `llvm::cfg::Update<llvm::BasicBlock*>::dump() const' ;; `llvm::cfg::Update<llvm::BasicBlock*>::dump() const'
,@(if (target-ppc64le?) ,@(if (or (target-ppc64le?)
(target-riscv64?))
`((setenv "CC" "gcc") `((setenv "CC" "gcc")
(setenv "CXX" "g++")) (setenv "CXX" "g++"))
`()) `())