This is an archive of the discontinued LLVM Phabricator instance.

Differential D159414

[Driver] Fixes for header / library paths on Haiku
ClosedPublic

Authored by brad on Sep 4 2023, 1:08 AM.

Details

Reviewers
nielx
korli
kallisti5
trungnt2910
Commits
rGa3ba9d697b17: [Driver] Fixes for header / library paths on Haiku
Summary

Some fixes for the header / library paths..

  • Use concat macro for all paths
  • Correct the C++ header paths
  • Add library path

Diff Detail

Event Timeline

brad created this revision.Sep 4 2023, 1:08 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 4 2023, 1:08 AM
brad requested review of this revision.Sep 4 2023, 1:08 AM
Herald added a subscriber: MaskRay. · View Herald TranscriptSep 4 2023, 1:08 AM
Harbormaster completed remote builds in B256484: Diff 555671.Sep 4 2023, 1:22 AM
brad updated this revision to Diff 555689.Sep 4 2023, 2:04 AM
Harbormaster completed remote builds in B256497: Diff 555689.Sep 4 2023, 2:39 AM
brad updated this revision to Diff 555783.Sep 4 2023, 6:05 PM
Herald added a subscriber: ormris. · View Herald TranscriptSep 4 2023, 6:05 PM
brad updated this revision to Diff 555785.Sep 4 2023, 6:33 PM

Add some C++ header path tests.

brad updated this revision to Diff 555794.Sep 4 2023, 8:07 PM
brad edited the summary of this revision. (Show Details)

Separate out the GCC path handling.

brad added a reviewer: trungnt2910.Sep 4 2023, 11:16 PM
trungnt2910 added a comment.Sep 5 2023, 12:15 AM

I'm not the Haiku toolchain expert here 😅, all I can do is comparing this with what the GCC toolchain for Haiku does.

clang/lib/Driver/ToolChains/Haiku.cpp
24–25

Should we also add the corresponding non-packaged paths, like /boot/system/non-packaged/lib and /boot/system/non-packaged/develop/lib?

The latest GCC toolchain on Haiku does not do it, but neither does it recognize non-packaged files for the headers.

85–86

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.

105–106

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.

clang/test/Driver/haiku.c
28

Should also remove this if the corresponding line in Haiku.cpp is removed.

brad added inline comments.Sep 5 2023, 12:48 AM
clang/lib/Driver/ToolChains/Haiku.cpp
85–86

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?

105–106

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.

trungnt2910 added inline comments.Sep 5 2023, 1:52 AM
clang/lib/Driver/ToolChains/Haiku.cpp
85–86

Yes, I was trying to select lines 85-86.

105–106

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.

brad added inline comments.Sep 5 2023, 5:03 AM
clang/lib/Driver/ToolChains/Haiku.cpp
24–25

Should we also add the corresponding non-packaged paths, like /boot/system/non-packaged/lib and /boot/system/non-packaged/develop/lib?

The latest GCC toolchain on Haiku does not do it, but neither does it recognize non-packaged files for the headers.

The second path does not exist and the first path has some sub-dirs (Perl / Python) but does not have any libraries.

I'm using what the LLVM patches had. I think we're good as is as a start.

24–25

Should we also add the corresponding non-packaged paths, like /boot/system/non-packaged/lib and /boot/system/non-packaged/develop/lib?

The latest GCC toolchain on Haiku does not do it, but neither does it recognize non-packaged files for the headers.

brad retitled this revision from Haiku: Fixes for header / library paths to [Driver] Fixes for header / library paths on Haiku.Sep 8 2023, 6:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.Sep 8 2023, 6:35 PM
This revision was landed with ongoing or failed builds.
Closed by commit rGa3ba9d697b17: [Driver] Fixes for header / library paths on Haiku (authored by brad). · Explain Why
This revision was automatically updated to reflect the committed changes.
brad marked 2 inline comments as not done.
brad added a commit: rGa3ba9d697b17: [Driver] Fixes for header / library paths on Haiku.
abrachet added a subscriber: abrachet.Sep 9 2023, 8:25 PM
abrachet added inline comments.
clang/test/Driver/haiku.cpp
3

This test is broken for people who configure with a different default CLANG_DEFAULT_CXX_STDLIB. I think this test should add --stdlib=libstdc++

brad added inline comments.Sep 9 2023, 8:28 PM
clang/test/Driver/haiku.cpp
3

This test is broken for people who configure with a different default CLANG_DEFAULT_CXX_STDLIB. I think this test should add --stdlib=libstdc++

Ah, I wasn't aware of that. I made the test such assuming the driver uses a default of libstdc++ on Haiku. I can add the flag.

abrachet added inline comments.Sep 9 2023, 8:30 PM
clang/test/Driver/haiku.cpp
3

I just made https://github.com/llvm/llvm-project/pull/65871, testing it now. But I think it should fix it

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
105 lines
test/
Driver/
Inputs/
haiku_x86_64_tree/
boot/
system/
develop/
headers/
c++/
v1/
36 lines
11 lines

Diff 555794

clang/lib/Driver/ToolChains/Haiku.cpp

Show All 15 Lines
using namespace clang; using namespace clang;
using namespace llvm::opt; using namespace llvm::opt;
/// Haiku - Haiku tool chain which can call as(1) and ld(1) directly. /// Haiku - Haiku tool chain which can call as(1) and ld(1) directly.
Haiku::Haiku(const Driver &D, const llvm::Triple& Triple, const ArgList &Args) Haiku::Haiku(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
: Generic_ELF(D, Triple, Args) { : Generic_ELF(D, Triple, Args) {
getFilePaths().push_back(concat(getDriver().SysRoot, "/boot/system/lib"));
getFilePaths().push_back(concat(getDriver().SysRoot, "/boot/system/develop/lib"));
trungnt2910Unsubmitted
Not Done
ReplyInline Actions

Should we also add the corresponding non-packaged paths, like /boot/system/non-packaged/lib and /boot/system/non-packaged/develop/lib?

The latest GCC toolchain on Haiku does not do it, but neither does it recognize non-packaged files for the headers.

trungnt2910: Should we also add the corresponding non-packaged paths, like `/boot/system/non-packaged/lib`…
bradAuthorUnsubmitted
Not Done
ReplyInline Actions

Should we also add the corresponding non-packaged paths, like /boot/system/non-packaged/lib and /boot/system/non-packaged/develop/lib?

The latest GCC toolchain on Haiku does not do it, but neither does it recognize non-packaged files for the headers.

The second path does not exist and the first path has some sub-dirs (Perl / Python) but does not have any libraries.

I'm using what the LLVM patches had. I think we're good as is as a start.

brad: > Should we also add the corresponding non-packaged paths, like `/boot/system/non-packaged/lib`…
bradAuthorUnsubmitted
Not Done
ReplyInline Actions

Should we also add the corresponding non-packaged paths, like /boot/system/non-packaged/lib and /boot/system/non-packaged/develop/lib?

The latest GCC toolchain on Haiku does not do it, but neither does it recognize non-packaged files for the headers.

brad: > Should we also add the corresponding non-packaged paths, like `/boot/system/non-packaged/lib`…
} }
void Haiku::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, void Haiku::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const { llvm::opt::ArgStringList &CC1Args) const {
const Driver &D = getDriver(); const Driver &D = getDriver();
if (DriverArgs.hasArg(options::OPT_nostdinc)) if (DriverArgs.hasArg(options::OPT_nostdinc))
return; return;
Show All 15 Lines if (!CIncludeDirs.empty()) {
for (StringRef dir : dirs) { for (StringRef dir : dirs) {
StringRef Prefix = StringRef Prefix =
llvm::sys::path::is_absolute(dir) ? StringRef(D.SysRoot) : ""; llvm::sys::path::is_absolute(dir) ? StringRef(D.SysRoot) : "";
addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir); addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);
} }
return; return;
} }
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/non-packaged/develop/headers"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os"); "/boot/system/non-packaged/develop/headers"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/app"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/device"); "/boot/system/develop/headers/os"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/drivers"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/game"); "/boot/system/develop/headers/os/app"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/interface"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/kernel"); "/boot/system/develop/headers/os/device"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/locale"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/mail"); "/boot/system/develop/headers/os/drivers"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/media"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/midi"); "/boot/system/develop/headers/os/game"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/midi2"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/net"); "/boot/system/develop/headers/os/interface"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/opengl"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/storage"); "/boot/system/develop/headers/os/kernel"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/support"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/translation"); "/boot/system/develop/headers/os/locale"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/add-ons/graphics"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/add-ons/input_server"); "/boot/system/develop/headers/os/mail"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/add-ons/mail_daemon"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/add-ons/registrar"); "/boot/system/develop/headers/os/media"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/add-ons/screen_saver"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/add-ons/tracker"); "/boot/system/develop/headers/os/midi"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/be_apps/Deskbar"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/be_apps/NetPositive"); "/boot/system/develop/headers/os/midi2"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/os/be_apps/Tracker"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/3rdparty"); "/boot/system/develop/headers/os/net"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/bsd"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/glibc"); "/boot/system/develop/headers/os/opengl"));
trungnt2910Unsubmitted
Not Done
ReplyInline Actions

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.

trungnt2910: Not included by GCC, and not found in my Haiku installation. I don't know what this is for…
bradAuthorUnsubmitted
Done
ReplyInline Actions

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?

brad: > Not included by GCC, and not found in my Haiku installation. > > I don't know what this is…
trungnt2910Unsubmitted
Done
ReplyInline Actions

Yes, I was trying to select lines 85-86.

trungnt2910: Yes, I was trying to select lines 85-86.
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/gnu"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers/posix"); "/boot/system/develop/headers/os/storage"));
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/boot/system/develop/headers"); addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/support"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/translation"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/add-ons/graphics"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/add-ons/input_server"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/add-ons/mail_daemon"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/add-ons/registrar"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/add-ons/screen_saver"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/add-ons/tracker"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/be_apps/Deskbar"));
trungnt2910Unsubmitted
Not Done
ReplyInline Actions

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.

trungnt2910: This seems to have been removed from Haiku, see: https://github.
bradAuthorUnsubmitted
Done
ReplyInline Actions

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.

brad: > This seems to have been removed from Haiku, see: https://github.
trungnt2910Unsubmitted
Done
ReplyInline Actions

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.

trungnt2910: I was comparing to the output of `gcc -v`, now I see what's happening: ``` ignoring…
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/be_apps/NetPositive"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/os/be_apps/Tracker"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/3rdparty"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/bsd"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/glibc"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/gnu"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/posix"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers"));
} }
void Haiku::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, void Haiku::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const { llvm::opt::ArgStringList &CC1Args) const {
addSystemInclude(DriverArgs, CC1Args, addSystemInclude(DriverArgs, CC1Args,
getDriver().SysRoot + "/system/develop/headers/c++/v1"); concat(getDriver().SysRoot, "/boot/system/develop/headers/c++/v1"));
} }
void Haiku::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, void Haiku::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const { llvm::opt::ArgStringList &CC1Args) const {
addLibStdCXXIncludePaths(getDriver().SysRoot + "/system/develop/headers/c++", addLibStdCXXIncludePaths(concat(getDriver().SysRoot, "/boot/system/develop/headers/c++"),
getTriple().str(), "", DriverArgs, CC1Args); getTriple().str(), "", DriverArgs, CC1Args);
} }

clang/test/Driver/Inputs/haiku_x86_64_tree/boot/system/develop/headers/c++/v1/.keep

  • This file was added.
This is an empty file.

clang/test/Driver/haiku.c

  • This file was added.
// Check the C header paths
// RUN: %clang --target=x86_64-unknown-haiku -### %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-C-HEADER-PATH %s
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/non-packaged/develop/headers"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/app"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/device"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/drivers"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/game"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/interface"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/kernel"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/locale"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/mail"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/media"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/midi"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/midi2"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/net"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/opengl"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/storage"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/support"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/translation"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/add-ons/graphics"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/add-ons/input_server"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/add-ons/mail_daemon"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/add-ons/registrar"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/add-ons/screen_saver"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/add-ons/tracker"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/be_apps/Deskbar"
trungnt2910Unsubmitted
Not Done
ReplyInline Actions

Should also remove this if the corresponding line in Haiku.cpp is removed.

trungnt2910: Should also remove this if the corresponding line in `Haiku.cpp` is removed.
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/be_apps/NetPositive"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/os/be_apps/Tracker"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/3rdparty"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/bsd"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/glibc"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/gnu"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers/posix"
// CHECK-C-HEADER-PATH: "-internal-isystem" "/boot/system/develop/headers"

clang/test/Driver/haiku.cpp

  • This file was added.
// Check the C++ header path (libstdc++)
// RUN: %clang++ --target=x86_64-unknown-haiku -### %s 2>&1 \
// RUN: --sysroot=%S/Inputs/haiku_x86_64_tree \
abrachetUnsubmitted
Not Done
ReplyInline Actions

This test is broken for people who configure with a different default CLANG_DEFAULT_CXX_STDLIB. I think this test should add --stdlib=libstdc++

abrachet: This test is broken for people who configure with a different default…
bradAuthorUnsubmitted
Done
ReplyInline Actions

This test is broken for people who configure with a different default CLANG_DEFAULT_CXX_STDLIB. I think this test should add --stdlib=libstdc++

Ah, I wasn't aware of that. I made the test such assuming the driver uses a default of libstdc++ on Haiku. I can add the flag.

brad: > This test is broken for people who configure with a different default…
abrachetUnsubmitted
Not Done
ReplyInline Actions

I just made https://github.com/llvm/llvm-project/pull/65871, testing it now. But I think it should fix it

abrachet: I just made https://github.com/llvm/llvm-project/pull/65871, testing it now. But I think it…
// RUN: | FileCheck --check-prefix=CHECK-LIBSTDCXX-HEADER-PATH %s
// CHECK-LIBSTDCXX-HEADER-PATH: "-internal-isystem" "[[SYSROOT:[^"]+]]/boot/system/develop/headers/c++"
// Check the C++ header path (when using libc++)
// RUN: %clang++ --target=x86_64-unknown-haiku --stdlib=libc++ -### %s 2>&1 \
// RUN: --sysroot=%S/Inputs/haiku_x86_64_tree \
// RUN: | FileCheck --check-prefix=CHECK-LIBCXX-HEADER-PATH %s
// CHECK-LIBCXX-HEADER-PATH: "-internal-isystem" "[[SYSROOT:[^"]+]]/boot/system/develop/headers/c++/v1"