From 81567f751bd31d972cf05013a177311b73425d7d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 10 Apr 2022 18:38:58 +0200 Subject: gnu: llvm-3: Fix build. * gnu/packages/llvm.scm (llvm-3.9)[arguments]: Use gexp. Add 'shared-lib-workaround' phase. Co-authored-by: Maxime Devos --- gnu/packages/llvm.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0011faa50f..8348638614 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -16,11 +16,11 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Lars-Dominik Braun -;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Greg Hogan ;;; @@ -945,8 +945,16 @@ (define-public llvm-3.9.1 (arguments (substitute-keyword-arguments (package-arguments llvm) ((#:phases phases) - `(modify-phases ,phases - (delete 'install-opt-viewer))))))) + #~(modify-phases #$phases + (add-before 'build 'shared-lib-workaround + ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen + ;; doesn't seem to get the correct rpath to be able to run + ;; from the build directory. Set LD_LIBRARY_PATH as a + ;; workaround. + (lambda _ + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/lib")))) + (delete 'install-opt-viewer))))))) (define-public clang-runtime-3.9.1 (clang-runtime-from-llvm -- cgit v1.2.3