From 59a10485550910ab6b5e61dbd1e53fe4dfae62ca Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 19 Sep 2025 21:13:42 +0200 Subject: [PATCH] gnu: llvm-3.5: Remove inheritance from llvm-3.7. * gnu/packages/llvm.scm (llvm-3.5)[inherit]: Replace llvm-3.7 by llvm-6. [outputs, arguments]: Copy-paste from llvm-3.7. Change-Id: Ic1743867ad5eec6fd6d3a806ddc3ba9e3539ab11 --- gnu/packages/llvm.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7a790e41feefce558a665eb6dffefb6fd90d6a43..37ca991418908306d30f0c9213d748d1a3217e6a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1109,7 +1109,7 @@ Library.") (delete 'install-opt-viewer))))))) (define-public llvm-3.5 - (package (inherit llvm-3.7) + (package (inherit llvm-6) (version "3.5.2") (source (origin @@ -1119,7 +1119,21 @@ Library.") (search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch")) (sha256 (base32 - "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4")))))) + "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4")))) + (outputs '("out")) + (arguments + (substitute-keyword-arguments (package-arguments llvm-6) + ((#:phases phases) + #~(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 llvm-16 (make-llvm "16.0.6"))