diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2025-01-25 15:01:46 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2025-01-25 15:13:59 +0300 |
| commit | f650858a77ecaf3efe413c2a7cd2089257b89abe (patch) | |
| tree | afcd0e2435e36ba4f8ee157bd134ab650c9bbb05 /contrib | |
| parent | c3efb51c05c80a676da435440106d33f9e611de4 (diff) | |
| download | ydb-f650858a77ecaf3efe413c2a7cd2089257b89abe.tar.gz | |
Intermediate changes
commit_hash:e10603531675799a9fac853dbe2ca92d85a6a939
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/.yandex_meta/__init__.py | 5 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/.yandex_meta/override.nix | 1 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/ya.make | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/__init__.py b/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/__init__.py index b825ca2ce9..0cf2002a9d 100644 --- a/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/__init__.py +++ b/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/__init__.py @@ -1,5 +1,6 @@ from devtools.yamaker import fileutil from devtools.yamaker import pathutil +from devtools.yamaker.platform_macros import make_llvm_nixattr from devtools.yamaker.modules import Library from devtools.yamaker.project import NixSourceProject @@ -81,7 +82,9 @@ def post_install(self): libcxxabi = NixSourceProject( owners=["g:cpp-committee", "g:cpp-contrib"], arcdir="contrib/libs/cxxsupp/libcxxabi", - nixattr="llvmPackages_16.libcxxabi", + # nixos-24.05 merged libcxx and libcxxabi. + # Use the primer and override sourceRoot in override.nix as aworkaround. + nixattr=make_llvm_nixattr("libcxx"), copy_sources=[ "include/__cxxabi_config.h", "include/cxxabi.h", diff --git a/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/override.nix b/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/override.nix index 1bba9a5bcc..8827587eeb 100644 --- a/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/override.nix +++ b/contrib/libs/cxxsupp/libcxxabi/.yandex_meta/override.nix @@ -9,6 +9,7 @@ pkgs: attrs: with pkgs; with attrs; rec { }; patches = []; + postPatch = ""; sourceRoot = "source/libcxxabi"; } diff --git a/contrib/libs/cxxsupp/libcxxabi/ya.make b/contrib/libs/cxxsupp/libcxxabi/ya.make index 169f844d09..c64ffff7e7 100644 --- a/contrib/libs/cxxsupp/libcxxabi/ya.make +++ b/contrib/libs/cxxsupp/libcxxabi/ya.make @@ -1,4 +1,4 @@ -# Generated by devtools/yamaker from nixpkgs 23.11. +# Generated by devtools/yamaker from nixpkgs 24.05. LIBRARY() |