From 0279555c9d146dc089e49b4d6c0a571a277e6d36 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 14 Sep 2025 18:53:09 +0200 Subject: [PATCH] gnu: Remove libcxx+libcxxabi-6. * gnu/packages/llvm.scm (libcxx+libcxxabi-6): Delete variable. Change-Id: Ie1cdb96d1d2b303e8a7c30ee958315e8aa057810 --- gnu/packages/llvm.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c226835c1361c6273b96aa38dede4ed4d35422b0..13ac2d5f4f14225c044fb5152d1a0e28bdc9bdc8 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1747,38 +1747,6 @@ use with Clang, targeting C++11, C++14 and above.") standard C++ library.") (license license:expat))) -(define-public libcxx+libcxxabi-6 - (package - (inherit libcxx-6) - (name "libcxx+libcxxabi") - (version (package-version libcxx-6)) - (arguments - (list - #:configure-flags - #~(list "-DLIBCXX_CXX_ABI=libcxxabi" - (string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=" - #$(this-package-native-input "libcxxabi") - "/include")) - #:phases - #~(modify-phases (@ (guix build cmake-build-system) %standard-phases) - (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Hide GCC's C++ headers so that they do not interfere with - ;; the ones we are attempting to build. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") - #\:)) - ":")) - (format - #true - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH")))))))) - (native-inputs - (list clang-6 llvm-6 libcxxabi-6)))) - ;; WARNING: This package is a dependency of mesa. (define-public libclc (package