~ruther/guix-local: gnu: llvm-3.8: Inherit from llvm-6.

a0733f5a9d1aaab6c83a8b76c55d5c8006452d54 — Andreas Enge 1 year, 1 month ago ba36c13

gnu: llvm-3.8: Inherit from llvm-6.

* gnu/packages/llvm.scm (llvm-3.8)[inherit]: Replace llvm-3.9.1 by llvm-6.
[outputs, arguments]: Copy from llvm-3.9.1.

Change-Id: I312c77dfa20c2e3bc1fb4fc76e3f3f532c74a6eb

patch browse .tar.gz .zip

1 files changed, 16 insertions(+), 2 deletions(-)

M gnu/packages/llvm.scm

M gnu/packages/llvm.scm => gnu/packages/llvm.scm +16 -2

@@ 1108,7 1108,7 @@ Library.")
             (delete 'install-opt-viewer)))))))
 
 (define-public llvm-3.8
-  (package (inherit llvm-3.9.1)
+  (package (inherit llvm-6)
     (name "llvm")
     (version "3.8.1")
     (source


@@ 1118,7 1118,21 @@ Library.")
       (sha256
        (base32
         "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))
-      (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 llvm-3.7
   (package (inherit llvm-6)