amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libcxx: Use G-expressions.

Browse source 
* gnu/packages/llvm.scm (libcxx)[arguments]: Use G-expressions.
(libcxx-6)[arguments]: Use G-expressions.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Zhu Zihao 2022-10-27 16:33:27 +08:00 • committed by Ludovic Courtès
parent b43200e5b1
commit 86af794215
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/llvm.scm
View file

@ -25,6 +25,7 @@
;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1540,22 +1541,23 @@ which highly leverage existing libraries in the larger LLVM project.")
"0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases (@ (guix build cmake-build-system) %standard-phases) #:phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH #~(modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(let ((gcc (assoc-ref inputs "gcc"))) (lambda* (#:key inputs #:allow-other-keys)
;; Hide GCC's C++ headers so that they do not interfere with (let ((gcc (assoc-ref inputs "gcc")))
;; the ones we are attempting to build. ;; Hide GCC's C++ headers so that they do not interfere with
(setenv "CPLUS_INCLUDE_PATH" ;; the ones we are attempting to build.
(string-join (delete (string-append gcc "/include/c++") (setenv "CPLUS_INCLUDE_PATH"
(string-split (getenv "CPLUS_INCLUDE_PATH") (string-join (delete (string-append gcc "/include/c++")
#\:)) (string-split (getenv "CPLUS_INCLUDE_PATH")
":")) #\:))
(format #t ":"))
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" (format #t
(getenv "CPLUS_INCLUDE_PATH")) "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
#t)))))) (getenv "CPLUS_INCLUDE_PATH"))
#t))))))
(native-inputs (native-inputs
(list clang llvm)) (list clang llvm))
(home-page "https://libcxx.llvm.org") (home-page "https://libcxx.llvm.org")
@ -1578,6 +1580,11 @@ use with Clang, targeting C++11, C++14 and above.")
(sha256 (sha256
(base32 (base32
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
(arguments
(substitute-keyword-arguments (package-arguments libcxx)
((#:phases p)
#~(modify-phases #$p
(delete 'enter-subdirectory)))))
(native-inputs (native-inputs
(list clang-6 llvm-6)))) (list clang-6 llvm-6))))