summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <[email protected]>2025-01-31 19:52:56 +0300
committerthegeorg <[email protected]>2025-01-31 20:09:01 +0300
commitab23c69305efbe4a26d080ff7054ffce3520c258 (patch)
tree0077fcdb52a4ccc37822db562b232ffb868b94ae
parent16981ec67a23463ba2532710940a7fe4eb28f812 (diff)
Allow resolving cxxabi.h into libcxxabi
commit_hash:9c3b26db50fa812b1a54fafe6e32bf4311e98264
-rw-r--r--build/sysincl/emscripten.yml2
-rw-r--r--build/sysincl/stl-to-libcxx.yml6
2 files changed, 3 insertions, 5 deletions
diff --git a/build/sysincl/emscripten.yml b/build/sysincl/emscripten.yml
index 7ae4c55c9d3..cf3eb5c5221 100644
--- a/build/sysincl/emscripten.yml
+++ b/build/sysincl/emscripten.yml
@@ -347,5 +347,3 @@
- emscripten/websocket.h: contrib/restricted/emscripten/system/include/emscripten/websocket.h
- stdc-predef.h: contrib/restricted/emscripten/system/lib/libc/musl/include/stdc-predef.h
-
- - cxxabi.h: contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h
diff --git a/build/sysincl/stl-to-libcxx.yml b/build/sysincl/stl-to-libcxx.yml
index ef8a55bafe7..4838f722448 100644
--- a/build/sysincl/stl-to-libcxx.yml
+++ b/build/sysincl/stl-to-libcxx.yml
@@ -32,7 +32,10 @@
- includes:
- cxxabi.h:
+ - contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h
- contrib/libs/cxxsupp/libcxxrt/include/cxxabi.h
+ - __cxxabi_config.h:
+ - contrib/libs/cxxsupp/libcxxabi/include/__cxxabi_config.h
- omp.h:
- contrib/libs/cxxsupp/openmp/omp.h
- unwind.h:
@@ -44,9 +47,6 @@
- math_cuda.h:
- contrib/libs/cxxsupp/libcxx/include/math_cuda.h
-- source_filter: "^contrib/libs/cxxsupp/libcxxabi/"
- includes:
- - cxxabi.h: contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h
# Though these are headers provided by libcxx, we do not want to allow them to be included.
# We are using non-existent filename to generate error instead, as there is no specific syntax for this case.