Drop -I to stl for bpf targets

commit_hash:ed9aed0cc15d46e1718fa49fcea36432fce52951

1 files changed, 13 insertions, 0 deletions

diff --git a/build/scripts/clang_wrapper.py b/build/scripts/clang_wrapper.py
index d5e48b91e10..71e0f03088e 100644
--- a/build/scripts/clang_wrapper.py
+++ b/build/scripts/clang_wrapper.py
@@ -31,6 +31,13 @@ def fix_path(p):
     return p
 
 
+def drop_stl(s):
+    if s.startswith('-I') and 'contrib/libs/cxxsupp/libcxx/include' in s:
+        return None
+
+    return s
+
+
 if __name__ == '__main__':
     is_on_win = sys.argv[1] == 'yes'
     path = sys.argv[2]
@@ -44,6 +51,12 @@ if __name__ == '__main__':
             pass
         args.append('-fms-compatibility-version=19')
 
+    for i in range(len(args) - 1):
+        if args[i] == '-target' and args[i + 1] == 'bpf':
+            # bpf should not be able to include stl headers
+            args = list(filter(None, [drop_stl(s) for s in args]))
+            break
+
     cmd = [path] + args
 
     rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout)