From 2b30f1f13d87c08b5a9891b867564a792b6ddf5b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 24 Nov 2018 23:37:42 +0100
Subject: [PATCH] llvm: fix include path for clang.

ie. /system/lib/x86/clang/include instead of
/system/lib/x86/x86/clang/include.
---
 sys-devel/llvm/llvm6-6.0.1.recipe           | 2 +-
 sys-devel/llvm/llvm7-7.0.0.recipe           | 2 +-
 sys-devel/llvm/patches/clang-6.0.1.patchset | 2 +-
 sys-devel/llvm/patches/clang-7.0.0.patchset | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-devel/llvm/llvm6-6.0.1.recipe b/sys-devel/llvm/llvm6-6.0.1.recipe
index 34d449107..884cf4d43 100644
--- a/sys-devel/llvm/llvm6-6.0.1.recipe
+++ b/sys-devel/llvm/llvm6-6.0.1.recipe
@@ -31,7 +31,7 @@ other than the ones listed above.
 HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2018 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://releases.llvm.org/$portVersion/llvm-$portVersion.src.tar.xz"
 CHECKSUM_SHA256="b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2"
 SOURCE_DIR="llvm-$portVersion.src"
diff --git a/sys-devel/llvm/llvm7-7.0.0.recipe b/sys-devel/llvm/llvm7-7.0.0.recipe
index 810066111..397db4811 100644
--- a/sys-devel/llvm/llvm7-7.0.0.recipe
+++ b/sys-devel/llvm/llvm7-7.0.0.recipe
@@ -31,7 +31,7 @@ other than the ones listed above.
 HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2018 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://releases.llvm.org/$portVersion/llvm-$portVersion.src.tar.xz"
 CHECKSUM_SHA256="8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222"
 SOURCE_DIR="llvm-$portVersion.src"
diff --git a/sys-devel/llvm/patches/clang-6.0.1.patchset b/sys-devel/llvm/patches/clang-6.0.1.patchset
index 4119b9b55..8420874a2 100644
--- a/sys-devel/llvm/patches/clang-6.0.1.patchset
+++ b/sys-devel/llvm/patches/clang-6.0.1.patchset
@@ -68,7 +68,7 @@ index 8c6face..4c04668 100644
 +    SmallString<128> P = llvm::sys::path::parent_path(NoVer);
 +
 +    // Get foo/include/c++/v1
-+    llvm::sys::path::append(P, HAIKU_HYBRID_SECONDARY, Clang, Ver);
++    llvm::sys::path::append(P, Clang, Ver);
 +#else
      SmallString<128> P = StringRef(HSOpts.ResourceDir);
 +#endif
diff --git a/sys-devel/llvm/patches/clang-7.0.0.patchset b/sys-devel/llvm/patches/clang-7.0.0.patchset
index 0084ad24b..156f41dbd 100644
--- a/sys-devel/llvm/patches/clang-7.0.0.patchset
+++ b/sys-devel/llvm/patches/clang-7.0.0.patchset
@@ -68,7 +68,7 @@ index 8a70404..c80c3da 100644
 +    SmallString<128> P = llvm::sys::path::parent_path(NoVer);
 +
 +    // Get foo/include/c++/v1
-+    llvm::sys::path::append(P, HAIKU_HYBRID_SECONDARY, Clang, Ver);
++    llvm::sys::path::append(P, Clang, Ver);
 +#else
      SmallString<128> P = StringRef(HSOpts.ResourceDir);
 +#endif