commit: 4ddd0a5aaa862839547bfedf459acb326fa977e8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 19:33:00 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 21:36:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ddd0a5a
sys-devel/llvm: Force x86 CHOST to i386-* for compiler-rt compat
Force x86 CHOST value to be i386-* since clang uses the exact arch value
to find compiler-rt libraries, and our compiler-rt libraries are named
'i386' unconditionally. It should still be able to find gcc install by
using alternate triple aliases.
sys-devel/llvm/llvm-4.0.0_rc1.ebuild | 5 ++++-
sys-devel/llvm/llvm-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
index bbd935a..ab685cb 100644
--- a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
@@ -156,7 +156,10 @@ multilib_src_configure() {
-DWITH_POLLY=OFF # TODO
- -DLLVM_HOST_TRIPLE="${CHOST}"
+ # 'normalize' x86 triples to i386-* since this is the name used
+ # by compiler-rt libraries.
+ # remove this when https://reviews.llvm.org/D26796 is merged
+ -DLLVM_HOST_TRIPLE="${CHOST/#i[4-9]86-/i386-}"
-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index a66f1e1..49c65e2 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -154,7 +154,10 @@ multilib_src_configure() {
-DWITH_POLLY=OFF # TODO
- -DLLVM_HOST_TRIPLE="${CHOST}"
+ # 'normalize' x86 triples to i386-* since this is the name used
+ # by compiler-rt libraries.
+ # remove this when https://reviews.llvm.org/D26796 is merged
+ -DLLVM_HOST_TRIPLE="${CHOST/#i[4-9]86-/i386-}"
-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
