Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
Date: Tue, 24 Jan 2017 09:31:21
Message-Id: 1485250264.c036cf30ae425fe029f832de5e7604bc426e1f82.mgorny@gentoo
1 commit: c036cf30ae425fe029f832de5e7604bc426e1f82
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 24 09:30:25 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 24 09:31:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c036cf30
7
8 sys-devel/llvm: Revert "Force x86 CHOST to i386-* [...]"
9
10 Revert the CHOST adjustment since it solves the issue only partially.
11
12 sys-devel/llvm/llvm-4.0.0_rc1.ebuild | 5 +----
13 sys-devel/llvm/llvm-9999.ebuild | 5 +----
14 2 files changed, 2 insertions(+), 8 deletions(-)
15
16 diff --git a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
17 index ab685cb..bbd935a 100644
18 --- a/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
19 +++ b/sys-devel/llvm/llvm-4.0.0_rc1.ebuild
20 @@ -156,10 +156,7 @@ multilib_src_configure() {
21
22 -DWITH_POLLY=OFF # TODO
23
24 - # 'normalize' x86 triples to i386-* since this is the name used
25 - # by compiler-rt libraries.
26 - # remove this when https://reviews.llvm.org/D26796 is merged
27 - -DLLVM_HOST_TRIPLE="${CHOST/#i[4-9]86-/i386-}"
28 + -DLLVM_HOST_TRIPLE="${CHOST}"
29
30 -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
31 -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
32
33 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
34 index 49c65e2..a66f1e1 100644
35 --- a/sys-devel/llvm/llvm-9999.ebuild
36 +++ b/sys-devel/llvm/llvm-9999.ebuild
37 @@ -154,10 +154,7 @@ multilib_src_configure() {
38
39 -DWITH_POLLY=OFF # TODO
40
41 - # 'normalize' x86 triples to i386-* since this is the name used
42 - # by compiler-rt libraries.
43 - # remove this when https://reviews.llvm.org/D26796 is merged
44 - -DLLVM_HOST_TRIPLE="${CHOST/#i[4-9]86-/i386-}"
45 + -DLLVM_HOST_TRIPLE="${CHOST}"
46
47 -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
48 -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"