Browse Source

Intermediate changes

robot-piglet 1 year ago
parent
commit
bee45a1c0a
2 changed files with 11 additions and 0 deletions
  1. 5 0
      build/sysincl/libc-to-musl.yml
  2. 6 0
      build/sysincl/linux.yml

+ 5 - 0
build/sysincl/libc-to-musl.yml

@@ -251,3 +251,8 @@
   - values.h:               contrib/libs/musl/include/values.h
   - wait.h:                 contrib/libs/musl/include/wait.h
   - wordexp.h:              contrib/libs/musl/include/wordexp.h
+
+# musl defines its own stub for stdc-predef
+- source_filter: ^(contrib/libs/glibcasm/glibc/include/features\.h)
+  includes:
+  - stdc-predef.h: contrib/libs/musl/include/stdc-predef.h

+ 6 - 0
build/sysincl/linux.yml

@@ -64,3 +64,9 @@
 - source_filter: "^contrib/python/(coverage|gevent|greenlet)"
   includes:
   - internal/pycore_frame.h: contrib/libs/python/Include/internal/pycore_frame.h
+
+# These are stubs for actual resolving into system
+- source_filter: ^(contrib/libs/glibcasm/glibc/include/features\.h)
+  includes:
+  - stdc-predef.h: contrib/libs/glibcasm/glibc/include/stdc-predef.h
+  - gnu/stubs.h: contrib/libs/glibcasm/glibc/include/gnu/stubs.h