From 22d0e9b79255dce67e6986e7529ccb0f843b102d Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Mon, 17 Aug 2015 08:26:07 +0200
Subject: [PATCH] gnu: Simplify LLVM build.
* gnu/packages/llvm.scm (llvm)[arguments]: Remove phases argument.
Add to configure-flags "-DCMAKE_SKIP_BUILD_RPATH=FALSE" and
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE".
---
gnu/packages/llvm.scm | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9e06a640920..2c96e9d638c 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -49,24 +49,8 @@ (define-public llvm
`(("python" ,python-wrapper)
("perl" ,perl)))
(arguments
- `(#:phases (alist-cons-before
- 'build 'link-lib-for-build-exec
- (lambda* (#:key outputs #:allow-other-keys)
- ;; This is a hacky fix that will allow binaries to run
- ;; before being installed. -DCMAKE_SKIP_BUILD_RPATH=FALSE
- ;; seems to not help. Nixpkgs does the same.
- (let* ((out (assoc-ref outputs "out"))
- (out-lib (string-append out "/lib"))
- (build-lib (string-append (getcwd) "/lib")))
- (mkdir-p out)
- (symlink build-lib out-lib)))
- (alist-cons-after
- 'build 'cleanup-out
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Cleanup the symlink that was created previously. Let
- ;; the install phase repopulate out.
- (delete-file-recursively (assoc-ref outputs "out")))
- %standard-phases))))
+ `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE")))
(home-page "http://www.llvm.org")
(synopsis "Optimizing compiler infrastructure")
(description
--
GitLab