From 4ddd0a5aaa862839547bfedf459acb326fa977e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 23 Jan 2017 20:33:00 +0100 Subject: [PATCH] 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 bbd935aa11dd..ab685cbdf591 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 a66f1e10dc84..49c65e2b36d0 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}" -- 2.26.2