[PATCH] D159414: Haiku: Fixes for header / library paths

[Trung Nguyen via Phabricator via cfe-commits]

trungnt2910 added inline comments.


================
Comment at: clang/lib/Driver/ToolChains/Haiku.cpp:85-86
+                   "/boot/system/develop/headers/os/net"));
+  addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+                   "/boot/system/develop/headers/os/opengl"));
+  addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
----------------
brad wrote:
> trungnt2910 wrote:
> > Not included by GCC, and not found in my Haiku installation.
> > 
> > I don't know what this is for though, so probably just keep it until someone else says otherwise.
> > Not included by GCC, and not found in my Haiku installation.
> > 
> > I don't know what this is for though, so probably just keep it until someone else says otherwise.
> 
> This is referring to the os/opengl directory?
Yes, I was trying to select lines 85-86.


================
Comment at: clang/lib/Driver/ToolChains/Haiku.cpp:105-106
+                   "/boot/system/develop/headers/os/add-ons/tracker"));
+  addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+                   "/boot/system/develop/headers/os/be_apps/Deskbar"));
+  addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
----------------
brad wrote:
> trungnt2910 wrote:
> > This seems to have been removed from Haiku, see: https://github.com/haiku/haiku/commit/a3e794ae459fec76826407f8ba8c94cd3535f128
> > 
> > The latest Haiku GCC toolchain does not include it.
> > This seems to have been removed from Haiku, see: https://github.com/haiku/haiku/commit/a3e794ae459fec76826407f8ba8c94cd3535f128
> > 
> > The latest Haiku GCC toolchain does not include it.
> 
> https://github.com/haikuports/haikuports/blob/master/sys-devel/gcc/patches/gcc-13.2.0_2023_08_10.patchset
> 
> I still see the path listed in the GCC configs.
> 
> But I see in the Haiku I have installed in my VM that the path indeed is gone.
I was comparing to the output of `gcc -v`, now I see what's happening:

```
ignoring nonexistent directory "/boot/system/non-packaged/develop/headers"
ignoring nonexistent directory "/boot/system/develop/headers/os/opengl"
ignoring nonexistent directory "/boot/system/develop/headers/os/be_apps/Deskbar"
ignoring nonexistent directory "/boot/system/develop/headers/3rdparty"
```

If GCC is doing that, I think we should keep things as they are.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D159414/new/

https://reviews.llvm.org/D159414