From c036cf30ae425fe029f832de5e7604bc426e1f82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 24 Jan 2017 10:30:25 +0100 Subject: [PATCH] sys-devel/llvm: Revert "Force x86 CHOST to i386-* [...]" Revert the CHOST adjustment since it solves the issue only partially. --- sys-devel/llvm/llvm-4.0.0_rc1.ebuild | 5 +---- sys-devel/llvm/llvm-9999.ebuild | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild index ab685cbdf591..bbd935aa11dd 100644 --- 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 49c65e2b36d0..a66f1e10dc84 100644 --- 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}" -- 2.26.2