guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 01/04: gnu: clang-from-llvm: Fix build on some architectures.
Date: Sat, 28 May 2022 15:25:24 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 4a53069b382f2b489ad197ede4d2c4cd2c7c8c16
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri May 27 14:41:29 2022 +0300

    gnu: clang-from-llvm: Fix build on some architectures.
    
    * gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Adjust custom
    'symlink-cfi_ignorelist phase to only symlink when the file exists.
---
 gnu/packages/llvm.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index c93c1db7fe..aedf039ff4 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com>
 ;;; 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 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; 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)
                                 ;; Symlink the ignorelist to where Clang 
expects
                                 ;; to find it.
-                                (symlink cfi-ignorelist
-                                         (string-append lib-share "/" 
file-name))))))
+                                ;; Not all architectures support CFI.
+                                ;; see: compiler-rt/cmake/config-ix.cmake
+                                (when (file-exists? cfi-ignorelist)
+                                  (symlink cfi-ignorelist
+                                           (string-append lib-share "/" 
file-name)))))))
                         '())
                   (add-after 'install 'install-clean-up-/share/clang
                     (lambda* (#:key outputs #:allow-other-keys)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]