haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

LLVM, bump revision for version 18, 19 and 20 (#12209)

Browse Source 
Fixes not finding stddef.h
This commit is contained in:
Schrijvers Luc
2025-04-23 18:43:35 +02:00
committed by GitHub
parent 385ab20efb
commit 37f1091022
6 changed files with 154 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-devel/llvm/llvm18-18.1.7.recipe
View File

@@ -30,7 +30,7 @@ other than the ones listed above.
HOMEPAGE="https://www.llvm.org/"
COPYRIGHT="2003-2024 University of Illinois at Urbana-Champaign"
LICENSE="Apache v2 with LLVM Exception"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-project-$portVersion.src.tar.xz"
CHECKSUM_SHA256="74446ab6943f686391954cbda0d77ae92e8a60c432eff437b8666e121d748ec4"
SOURCE_DIR="llvm-project-$portVersion.src"

2
sys-devel/llvm/llvm19-19.1.7.recipe
View File

@@ -30,7 +30,7 @@ other than the ones listed above.
HOMEPAGE="https://www.llvm.org/"
COPYRIGHT="2003-2024 University of Illinois at Urbana-Champaign"
LICENSE="Apache v2 with LLVM Exception"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-project-$portVersion.src.tar.xz"
CHECKSUM_SHA256="82401fea7b79d0078043f7598b835284d6650a75b93e64b6f761ea7b63097501"
SOURCE_DIR="llvm-project-$portVersion.src"

2
sys-devel/llvm/llvm20-20.1.0.recipe
View File

@@ -30,7 +30,7 @@ other than the ones listed above.
HOMEPAGE="https://www.llvm.org/"
COPYRIGHT="2003-2025 University of Illinois at Urbana-Champaign"
LICENSE="Apache v2 with LLVM Exception"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-project-$portVersion.src.tar.xz"
CHECKSUM_SHA256="4579051e3c255fb4bb795d54324f5a7f3ef79bd9181e44293d7ee9a7f62aad9a"
SOURCE_DIR="llvm-project-$portVersion.src"

73
sys-devel/llvm/patches/llvm18-18.1.7.patchset
View File

@@ -1,4 +1,4 @@
From 4a32e3434770e23d0b633db6a168242f9a5081d4 Mon Sep 17 00:00:00 2001
From 8fec347a0557dcb08b35f21aed07bd8c59db7b44 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Sun, 9 Sep 2018 16:11:42 +0100
Subject: llvm: import header dir suffix patch from 3dEyes
@@ -21,10 +21,10 @@ index d5b76b1..df3fb59 100644
SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
sys::fs::make_absolute(ActivePrefix, Path);
--
2.45.2
2.48.1
From d7c1eec10cc400f21d66763d3210fe49ae67d2c9 Mon Sep 17 00:00:00 2001
From 19b07e061d80860623959ed562534d1ad42fca76 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 3 Apr 2021 23:23:24 +0200
Subject: lld: MachO needs libunwind somehow, disable
@@ -115,10 +115,10 @@ index d6800fa..d2bac9f 100644
int lld_main(int argc, char **argv, const llvm::ToolContext &) {
--
2.45.2
2.48.1
From 5fb1e0b269b1d88198709dc92c5a99c936affbc0 Mon Sep 17 00:00:00 2001
From a2843f7b71dd2d4fdfdc0d97d929796d3aa663e9 Mon Sep 17 00:00:00 2001
From: Trung Nguyen <trungnt282910@gmail.com>
Date: Thu, 7 Jul 2022 22:19:34 +0700
Subject: libunwind: Haiku: Initial support
@@ -168,10 +168,10 @@ index 780430b..2ffaf45 100644
string(REPLACE ";" " " LIBUNWIND_COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}")
--
2.45.2
2.48.1
From f3dbda4b0ca0b249fbb65fcb3e3a992c615cb392 Mon Sep 17 00:00:00 2001
From 35a9276e41da37218e82fe09b923c6d0da82f749 Mon Sep 17 00:00:00 2001
From: X512 <danger_mail@list.ru>
Date: Wed, 16 Mar 2022 07:04:18 +0900
Subject: libunwind: Haiku: Signal frame unwinding support
@@ -298,10 +298,10 @@ index 7753936..d7e4344 100644
result = this->stepThroughSigReturn();
} else
--
2.45.2
2.48.1
From 7d62fd071eb21ca11ef4fc8bbff223d7bc3bf9a8 Mon Sep 17 00:00:00 2001
From 3130e934712859b22e3ac90a381935e046479f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 18 Jul 2016 14:13:19 +0200
Subject: clang: support for secondary arch.
@@ -393,10 +393,10 @@ index e0d9403..3b9e9ee 100644
"/boot/system/develop/headers"));
}
--
2.45.2
2.48.1
From 246062b05e97f102d1bc84468f4c07be0e4bbcd2 Mon Sep 17 00:00:00 2001
From 1df212b83a164c554ebef8e5e628fa7edf58e8e2 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Thu, 21 Sep 2023 17:44:12 +0000
Subject: fix build on x86 secondary arch
@@ -416,10 +416,10 @@ index b9a966b..81277dc 100644
set(generated_files)
--
2.45.2
2.48.1
From 70b5acf2b8bd7de402f90f38199010a25a582608 Mon Sep 17 00:00:00 2001
From 20523450f9e156af2c4182f28908ca0c1dc1e461 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 6 Nov 2023 14:24:21 +0100
Subject: clang: Haiku: patch for analyzer scripts
@@ -478,10 +478,10 @@ index d01aebb..43ba8c3 100755
# Otherwise look relative to the source
share = os.path.dirname(__file__) + "/../../scan-view/share"
--
2.45.2
2.48.1
From 3f21b8119674b6c7ee6f42085c183ed6bf538841 Mon Sep 17 00:00:00 2001
From ca3f99f6681372f34ec14eb8554de7079f00e443 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Sun, 3 Mar 2024 21:58:38 +0100
Subject: Link libnetwork on Haiku in llvm-jitlink
@@ -500,10 +500,10 @@ index c9d1d23..702090c 100644
+ endif()
export_executable_symbols(llvm-jitlink)
--
2.45.2
2.48.1
From 2fa91219ac9f7fce878d1c91975c0c34a9337886 Mon Sep 17 00:00:00 2001
From 8a3488545f8f45792471492762799445889a7f2f Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Mon, 10 Jun 2024 11:13:29 +0200
Subject: A slightly better llvm-config diff that doesn't use #ifdef.
@@ -546,10 +546,10 @@ index df3fb59..30cb748 100644
SharedExt = "dll";
SharedVersionedExt = LLVM_DYLIB_VERSION ".dll";
--
2.45.2
2.48.1
From 0179f30af73bc9e3583b91bbfdd9cb31c7e85b65 Mon Sep 17 00:00:00 2001
From b7fb756a15c080d19fada4637670c5a78b5a759b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 May 2024 10:31:55 +0200
Subject: Allow linking gcc compiled code with lld
@@ -572,10 +572,10 @@ index 8b2c32b..c8ad6c3 100644
.Case("elf64_sparc", {ELF64BEKind, EM_SPARCV9})
.Case("msp430elf", {ELF32LEKind, EM_MSP430})
--
2.45.2
2.48.1
From 56179ddca46cc0357842122c5fad5a4fee4d2d33 Mon Sep 17 00:00:00 2001
From 8e1331d0bc34029b66497ceda81e8956f4b2d84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 2 Sep 2024 17:41:04 +0200
Subject: Add support for LLVM profile for Haiku
@@ -737,5 +737,34 @@ index d3ba115..c9a272e 100644
config.unsupported = True
--
2.45.2
2.48.1
From b1120b9cd36fc0e3a9581041d484044d870fbed7 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 17 Apr 2025 13:43:33 +0200
Subject: Fix missing PATH for stddef
diff --git a/clang/lib/Driver/ToolChains/Haiku.cpp b/clang/lib/Driver/ToolChains/Haiku.cpp
index 3b9e9ee..94b2efd 100644
--- a/clang/lib/Driver/ToolChains/Haiku.cpp
+++ b/clang/lib/Driver/ToolChains/Haiku.cpp
@@ -278,6 +278,14 @@ void Haiku::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
"/boot/system/develop/headers/gnu"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/posix"));
+#ifdef HAIKU_HYBRID_SECONDARY
+ addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+ "/boot/system/develop/headers/"
+ HAIKU_HYBRID_SECONDARY "/gcc/include"));
+#else
+ addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+ "/boot/system/develop/headers/gcc/include"));
+#endif
#ifdef HAIKU_HYBRID_SECONDARY
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/"
--
2.48.1

73
sys-devel/llvm/patches/llvm19-19.1.7.patchset
View File

@@ -1,4 +1,4 @@
From c889a524186b2dc4823acee2f535401a2e5ffb2c Mon Sep 17 00:00:00 2001
From e6d5fde3244eca15e8ad5c1df33a3f67ba16344b Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Sun, 9 Sep 2018 16:11:42 +0100
Subject: llvm: import header dir suffix patch from 3dEyes
@@ -21,10 +21,10 @@ index d5b76b1..df3fb59 100644
SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
sys::fs::make_absolute(ActivePrefix, Path);
--
2.45.2
2.48.1
From 5faeba9592368141f0447515383bc488386353d6 Mon Sep 17 00:00:00 2001
From ea2900debdf2ed26a8815216fb0c36bf8a045415 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 3 Apr 2021 23:23:24 +0200
Subject: lld: MachO needs libunwind somehow, disable
@@ -115,10 +115,10 @@ index d6800fa..d2bac9f 100644
int lld_main(int argc, char **argv, const llvm::ToolContext &) {
--
2.45.2
2.48.1
From 3fdf16017258c6f8f53da32c25fa399eb51de430 Mon Sep 17 00:00:00 2001
From e93172f5ef491800330ff0a76c0d47630804ca23 Mon Sep 17 00:00:00 2001
From: Trung Nguyen <trungnt282910@gmail.com>
Date: Thu, 7 Jul 2022 22:19:34 +0700
Subject: libunwind: Haiku: Initial support
@@ -157,10 +157,10 @@ index 780430b..9b20b08 100644
string(REPLACE ";" " " LIBUNWIND_COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}")
--
2.45.2
2.48.1
From 0f2e542dde782aa14dc05d36e782020bee5aab09 Mon Sep 17 00:00:00 2001
From 743dc477723387ad462ec627d5b56a3260284a28 Mon Sep 17 00:00:00 2001
From: X512 <danger_mail@list.ru>
Date: Wed, 16 Mar 2022 07:04:18 +0900
Subject: libunwind: Haiku: Signal frame unwinding support
@@ -287,10 +287,10 @@ index 06e6541..19fd8a7 100644
result = this->stepThroughSigReturn();
} else
--
2.45.2
2.48.1
From b518455b31a9511efc4dc723da6de75209797313 Mon Sep 17 00:00:00 2001
From 03a9435e86edd66bf751cd6dbd14e87ed4d90586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 18 Jul 2016 14:13:19 +0200
Subject: clang: support for secondary arch.
@@ -382,10 +382,10 @@ index 346652a..8fc9b49 100644
"/boot/system/develop/headers"));
}
--
2.45.2
2.48.1
From 508fca8cf875a384b45023292386deb544863122 Mon Sep 17 00:00:00 2001
From 1d73859903bbe36d3afe162103da9dd80db1b0ce Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Thu, 21 Sep 2023 17:44:12 +0000
Subject: fix build on x86 secondary arch
@@ -405,10 +405,10 @@ index 89fa0ec..c91d5b7 100644
set(generated_files)
--
2.45.2
2.48.1
From 1da33e39bba560d6cefaf23f2043658d15d14556 Mon Sep 17 00:00:00 2001
From 68099a1e9e26debbba3068b67617a5750ca04d00 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 6 Nov 2023 14:24:21 +0100
Subject: clang: Haiku: patch for analyzer scripts
@@ -467,10 +467,10 @@ index d01aebb..43ba8c3 100755
# Otherwise look relative to the source
share = os.path.dirname(__file__) + "/../../scan-view/share"
--
2.45.2
2.48.1
From 9244fd11eeeb3ae1dd5048dba02eb1049f1a556c Mon Sep 17 00:00:00 2001
From f8fcae05124f4a85492c3b3ee3d1c33d888a0229 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Sun, 3 Mar 2024 21:58:38 +0100
Subject: Link libnetwork on Haiku in llvm-jitlink
@@ -489,10 +489,10 @@ index 1487e78..da270a7 100644
+ endif()
export_executable_symbols(llvm-jitlink)
--
2.45.2
2.48.1
From 630dc2f8cb9543732b859d235ea07e1b9149cc29 Mon Sep 17 00:00:00 2001
From 0399610a0e7c27f09f174a0a12743ab56d62d7dd Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Mon, 10 Jun 2024 11:13:29 +0200
Subject: A slightly better llvm-config diff that doesn't use #ifdef.
@@ -535,10 +535,10 @@ index df3fb59..30cb748 100644
SharedExt = "dll";
SharedVersionedExt = LLVM_DYLIB_VERSION ".dll";
--
2.45.2
2.48.1
From 109f9a4ff2f2d735e8bdd7b4f502e70f03b72387 Mon Sep 17 00:00:00 2001
From ee6e2829a801b8bc2a3c44dd52a90add35b5fc8a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 May 2024 10:31:55 +0200
Subject: Allow linking gcc compiled code with lld
@@ -561,10 +561,10 @@ index eb6734d..4a66983 100644
.Case("elf64_sparc", {ELF64BEKind, EM_SPARCV9})
.Case("msp430elf", {ELF32LEKind, EM_MSP430})
--
2.45.2
2.48.1
From b72a083be9b8ac0019b3604eaa7c2c5172338702 Mon Sep 17 00:00:00 2001
From 5785053a9274bd4597c81211bd8f67e6f459332a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 2 Sep 2024 17:41:04 +0200
Subject: Add support for LLVM profile for Haiku
@@ -726,5 +726,34 @@ index d3ba115..c9a272e 100644
config.unsupported = True
--
2.45.2
2.48.1
From 46cc0101befd614279fd9cfffb041a425fe0e8bb Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 19 Apr 2025 19:16:09 +0200
Subject: Fix missing PATH for stddef
diff --git a/clang/lib/Driver/ToolChains/Haiku.cpp b/clang/lib/Driver/ToolChains/Haiku.cpp
index 8fc9b49..1fd2cf8 100644
--- a/clang/lib/Driver/ToolChains/Haiku.cpp
+++ b/clang/lib/Driver/ToolChains/Haiku.cpp
@@ -281,6 +281,14 @@ void Haiku::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
"/boot/system/develop/headers/gnu"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/posix"));
+#ifdef HAIKU_HYBRID_SECONDARY
+ addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+ "/boot/system/develop/headers/"
+ HAIKU_HYBRID_SECONDARY "/gcc/include"));
+#else
+ addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+ "/boot/system/develop/headers/gcc/include"));
+#endif
#ifdef HAIKU_HYBRID_SECONDARY
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/"
--
2.48.1

69
sys-devel/llvm/patches/llvm20-20.1.0.patchset
View File

@@ -1,4 +1,4 @@
From 02731acd2c3cdfcc4b821ea11d239d933c855f0a Mon Sep 17 00:00:00 2001
From 194a961e597a18b42f309c8fd145aaee3cd5c956 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Sun, 9 Sep 2018 16:11:42 +0100
Subject: llvm: import header dir suffix patch from 3dEyes
@@ -21,10 +21,10 @@ index d5b76b1..df3fb59 100644
SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
sys::fs::make_absolute(ActivePrefix, Path);
--
2.45.2
2.48.1
From 2966463873c41e12d04aeee3ff4e21888f0a67e5 Mon Sep 17 00:00:00 2001
From 1391e358ed21a3c66081e2bc6ee562bf776ef6e4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 3 Apr 2021 23:23:24 +0200
Subject: lld: MachO needs libunwind somehow, disable
@@ -115,10 +115,10 @@ index d6800fa..d2bac9f 100644
int lld_main(int argc, char **argv, const llvm::ToolContext &) {
--
2.45.2
2.48.1
From e51f14e826cebba4d6a3c92f2038ed576a21db41 Mon Sep 17 00:00:00 2001
From cb1e6de69a76c96f6ba5dd8e1a3e13946d46776b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 18 Jul 2016 14:13:19 +0200
Subject: clang: support for secondary arch.
@@ -210,10 +210,10 @@ index af74f43..fa3f8cb 100644
"/boot/system/develop/headers"));
}
--
2.45.2
2.48.1
From 7ebd6764fcdad160b6bca94ef5117955ae3e111b Mon Sep 17 00:00:00 2001
From f429e1e4e5f467a9d4a3a56dd6e290d545eb20a5 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Thu, 21 Sep 2023 17:44:12 +0000
Subject: fix build on x86 secondary arch
@@ -233,10 +233,10 @@ index 4312411..04db3fb 100644
set(generated_files)
--
2.45.2
2.48.1
From 8ec09943cb3349bf8e6bcfabad3fa70302bcfa9d Mon Sep 17 00:00:00 2001
From 01ff9cc116a23b6cb2fa947bbab777a23c1a3926 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Mon, 6 Nov 2023 14:24:21 +0100
Subject: clang: Haiku: patch for analyzer scripts
@@ -295,10 +295,10 @@ index d01aebb..43ba8c3 100755
# Otherwise look relative to the source
share = os.path.dirname(__file__) + "/../../scan-view/share"
--
2.45.2
2.48.1
From e1d8ff2835290c25f6889c701215e9e32f37fa7f Mon Sep 17 00:00:00 2001
From 38fea247005185b27950b1773b1d33e10d3a689f Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Mon, 10 Jun 2024 11:13:29 +0200
Subject: A slightly better llvm-config diff that doesn't use #ifdef.
@@ -341,10 +341,10 @@ index df3fb59..30cb748 100644
SharedExt = "dll";
SharedVersionedExt = LLVM_DYLIB_VERSION ".dll";
--
2.45.2
2.48.1
From dd2fd7143d80bafeee9daee53ce6014beb58326c Mon Sep 17 00:00:00 2001
From c6ed88a0090974f81c99d3a226a1c51bbc8b0da7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 May 2024 10:31:55 +0200
Subject: Allow linking gcc compiled code with lld
@@ -367,10 +367,10 @@ index a1e9eca..cc563d7 100644
.Case("elf64_sparc", {ELF64BEKind, EM_SPARCV9})
.Case("msp430elf", {ELF32LEKind, EM_MSP430})
--
2.45.2
2.48.1
From f9b37b57bf9b3703676e57a2d58d3fdbd00809f9 Mon Sep 17 00:00:00 2001
From 58fd61d6302a83e2f2d0ce0c544e25f8bad100f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Thu, 6 Feb 2025 21:08:43 +0100
Subject: Haiku: Address sanitizer on x86_64
@@ -2027,10 +2027,10 @@ index bbe7040..9289b99 100644
Mapping.Offset = kDefaultShadowOffset64;
}
--
2.45.2
2.48.1
From c10c5257e1bcbb14c2656d0120742cb2a73296c9 Mon Sep 17 00:00:00 2001
From d591da66d61a66c422f8a46f33c439f28bd43ea6 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Sun, 15 Dec 2024 10:26:32 +0000
Subject: [OpenMP] Add support for Haiku
@@ -2292,10 +2292,10 @@ index a73f2b3..4c17802 100644
#include <omp-tools.h>
#include <omp.h>
--
2.45.2
2.48.1
From d6643f6469eec1c6d32a0718549ad14e02d9e6ea Mon Sep 17 00:00:00 2001
From 336c454eb9853018ca99447311da4d57c8ef2b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 24 Mar 2025 21:41:12 +0100
Subject: install headers in clang/../include/ where clang searches them
@@ -2315,5 +2315,34 @@ index d92bc0e..4268fbb 100644
"Path where compiler-rt headers should be installed.")
extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}")
--
2.45.2
2.48.1
From d8b52bbbacfb7b3326813cfaff1e1c3eb54c630f Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 17 Apr 2025 16:38:48 +0200
Subject: Fix missing PATH for stddef
diff --git a/clang/lib/Driver/ToolChains/Haiku.cpp b/clang/lib/Driver/ToolChains/Haiku.cpp
index 79054fe..c1c7341 100644
--- a/clang/lib/Driver/ToolChains/Haiku.cpp
+++ b/clang/lib/Driver/ToolChains/Haiku.cpp
@@ -286,6 +286,14 @@ void Haiku::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
"/boot/system/develop/headers/gnu"));
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/posix"));
+#ifdef HAIKU_HYBRID_SECONDARY
+ addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+ "/boot/system/develop/headers/"
+ HAIKU_HYBRID_SECONDARY "/gcc/include"));
+#else
+ addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
+ "/boot/system/develop/headers/gcc/include"));
+#endif
#ifdef HAIKU_HYBRID_SECONDARY
addSystemInclude(DriverArgs, CC1Args, concat(D.SysRoot,
"/boot/system/develop/headers/"
--
2.48.1