ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libcxx+libcxxabi: Use G-expressions.

Browse source 
* gnu/packages/llvm.scm (libcxx+libcxxabi-6)[arguments]: Use G-expressions.
<#:configure-flags>: Use "this-package-native-input".

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

44
gnu/packages/llvm.scm
View file

@ -1677,27 +1677,29 @@ (define-public libcxx+libcxxabi-6
(name "libcxx+libcxxabi") (name "libcxx+libcxxabi")
(version (package-version libcxx-6)) (version (package-version libcxx-6))
(arguments (arguments
`(#:configure-flags (list
(list "-DLIBCXX_CXX_ABI=libcxxabi" #:configure-flags
(string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=" #~(list "-DLIBCXX_CXX_ABI=libcxxabi"
(assoc-ref %build-inputs "libcxxabi") (string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS="
"/include")) #$(this-package-native-input "libcxxabi")
#:phases "/include"))
(modify-phases (@ (guix build cmake-build-system) %standard-phases) #:phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH #~(modify-phases (@ (guix build cmake-build-system) %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 (setenv "CPLUS_INCLUDE_PATH"
(delete (string-append gcc "/include/c++") (string-join
(string-split (getenv "CPLUS_INCLUDE_PATH") (delete (string-append gcc "/include/c++")
#\:)) (string-split (getenv "CPLUS_INCLUDE_PATH")
":")) #\:))
(format #true ":"))
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" (format
(getenv "CPLUS_INCLUDE_PATH")))))))) #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(native-inputs (native-inputs
(list clang-6 llvm-6 libcxxabi-6)))) (list clang-6 llvm-6 libcxxabi-6))))