From bee83cb2079af767c3ae3b76da346ed4b510574d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 19 Aug 2025 22:04:50 +0200 Subject: [PATCH] gnu: llvm-3.7: Inherit from llvm-6. * gnu/packages/llvm.scm (llvm-3.7)[inherit]: Replace llvm-3.8 by llvm-6. [outputs, arguments]: Copy from llvm-3.9.1. Change-Id: Ia731ac5b4b0964277c5c0070783a951c26f28dfc --- 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 2666d502f25cfb068baf20c0f0684f6d5012c483..048933ebebc527080e70b6f1567593f2e5abb163 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1150,7 +1150,7 @@ Library.") #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.7 - (package (inherit llvm-3.8) + (package (inherit llvm-6) (version "3.7.1") (source (origin @@ -1159,7 +1159,21 @@ Library.") (sha256 (base32 "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy")) - (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch")))))) + (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch")))) + (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 clang-runtime-3.7 (clang-runtime-from-llvm