me/guix
Archived
1
0
Fork 0
Code Activity

gnu: clang-from-llvm: Fix build on some architectures.

Browse source 
* gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Adjust custom
'symlink-cfi_ignorelist phase to only symlink when the file exists.
This commit is contained in:
Efraim Flashner 2022-05-27 14:41:29 +03:00
parent cc0401a9de
commit 4a53069b38
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/llvm.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@ -353,8 +353,11 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the
(mkdir-p lib-share) (mkdir-p lib-share)
;; Symlink the ignorelist to where Clang expects ;; Symlink the ignorelist to where Clang expects
;; to find it. ;; to find it.
;; Not all architectures support CFI.
;; see: compiler-rt/cmake/config-ix.cmake
(when (file-exists? cfi-ignorelist)
(symlink cfi-ignorelist (symlink cfi-ignorelist
(string-append lib-share "/" file-name)))))) (string-append lib-share "/" file-name)))))))
'()) '())
(add-after 'install 'install-clean-up-/share/clang (add-after 'install 'install-clean-up-/share/clang
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)