summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-01-24 10:30:25 +0100
committerMichał Górny <mgorny@gentoo.org>2017-01-24 10:31:04 +0100
commitc036cf30ae425fe029f832de5e7604bc426e1f82 (patch)
treef986125828f162dfb58ac9c4cffe184e18160f9b /sys-devel/llvm
parentwww-apps/grafana-bin: bump to 4.1.1 (diff)
downloadgentoo-c036cf30ae425fe029f832de5e7604bc426e1f82.tar.gz
gentoo-c036cf30ae425fe029f832de5e7604bc426e1f82.tar.bz2
gentoo-c036cf30ae425fe029f832de5e7604bc426e1f82.zip
sys-devel/llvm: Revert "Force x86 CHOST to i386-* [...]"
Revert the CHOST adjustment since it solves the issue only partially.
Diffstat (limited to 'sys-devel/llvm')
-rw-r--r--sys-devel/llvm/llvm-4.0.0_rc1.ebuild5
-rw-r--r--sys-devel/llvm/llvm-9999.ebuild5
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 ab685cbdf59..bbd935aa11d 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 49c65e2b36d..a66f1e10dc8 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}"