Allow resolving cxxabi.h into libcxxabi

commit_hash:9c3b26db50fa812b1a54fafe6e32bf4311e98264
yandex · Jan 31, 2025 · a8e68bb · a8e68bb
1 parent b831a97
commit a8e68bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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