build/platform/clang/clang16.json

@@ -10,7 +10,7 @@
             "uri": "sbr:4598408410"
         },
         "linux-x86_64": {
-            "uri": "sbr:4597592901"
+            "uri": "sbr:5531183987"
         },
         "win32-x86_64": {
             "uri": "sbr:4597657641"

build/scripts/clang_wrapper.py

@@ -6,6 +6,9 @@ def fix(s):
     if s.startswith('-isystem') and s.endswith('/share/include'):
         return None
 
+    if s.startswith('-imsvc') and s.endswith('/share/include'):
+        return None
+
     if s == '/Z7' or s == '/Od' or s == '/Ob0' or s == '/D_DEBUG':
         return None
 

build/ymake_conf.py

@@ -1987,6 +1987,9 @@ class MSVCCompiler(MSVC, Compiler):
         cxx_warnings = []
 
         if self.tc.use_clang:
+            if self.tc.from_arcadia:
+                flags += ['-imsvc{}/share/include'.format(self.tc.name_marker)]
+
             flags += [
                 # Allow <windows.h> to be included via <Windows.h> in case-sensitive file-systems.
                 '-fcase-insensitive-paths',