From 300b795520baf106b662f045fe7d644643e8e7d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jul 2020 16:41:30 +0200 Subject: gnu: Clang: Install the CFI blacklist. * gnu/packages/llvm.scm (clang-from-llvm)[arguments]: Add phase to symlink cfi_blacklist.txt from CLANG-RUNTIME. --- gnu/packages/llvm.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index b7bc21ea6e..4a17ecd664 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -388,6 +388,25 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the (("@GLIBC_LIBDIR@") (string-append libc "/lib")))))) #t))) + (add-after 'install 'symlink-cfi_blacklist + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib-share (string-append out "/lib/clang/" + ,version "/share")) + (compiler-rt (assoc-ref inputs "clang-runtime")) + ;; The location varies between Clang versions. + (cfi-blacklist + (cond ((file-exists? + (string-append compiler-rt "/cfi_blacklist.txt")) + (string-append compiler-rt "/cfi_blacklist.txt")) + (else (string-append compiler-rt + "/share/cfi_blacklist.txt"))))) + (mkdir-p lib-share) + ;; Symlink cfi_blacklist.txt to where Clang expects + ;; to find it. + (symlink cfi-blacklist + (string-append lib-share "/cfi_blacklist.txt")) + #t))) (add-after 'install 'install-clean-up-/share/clang (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1