sys-devel/llvm: Revert "Force x86 CHOST to i386-* [...]"

Revert the CHOST adjustment since it solves the issue only partially.

diff --git a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
index ab685cbdf59160e605cf7e90510983dd3907ea47..bbd935aa11dd3f1ca3c02f846f0f47915bc4a0d4 100644 (file)
--- a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
@@ -156,10 +156,7 @@ multilib_src_configure() {
 
                -DWITH_POLLY=OFF # TODO
 
-               # '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-}"
+               -DLLVM_HOST_TRIPLE="${CHOST}"
 
                -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 49c65e2b36d02cbd697c79697957cbb3a3f4962b..a66f1e10dc84deb5001fb56b8b9734babfee8b3e 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -154,10 +154,7 @@ multilib_src_configure() {
 
                -DWITH_POLLY=OFF # TODO
 
-               # '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-}"
+               -DLLVM_HOST_TRIPLE="${CHOST}"
 
                -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
                -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"