[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/

[Fabian Groffen]

commit:     c5a7da31d5e2b764a099a60b4c2c4605a00c689c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 18:53:19 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 18:54:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a7da31

sys-devel/llvm: disable the use of xcrun on OSX, bug #568758

Package-Manager: portage-2.2.20-prefix

 sys-devel/llvm/llvm-3.5.2.ebuild | 3 +++
 sys-devel/llvm/llvm-3.6.2.ebuild | 3 +++
 sys-devel/llvm/llvm-3.7.1.ebuild | 3 +++
 sys-devel/llvm/llvm-9999.ebuild  | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 8a8c32c..f6bb2c3 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -165,6 +165,9 @@ src_prepare() {
                        projects/compiler-rt/make/platform/clang_*.mk || die
        fi
 
+       # disable use of SDK on OSX, bug #568758
+       sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
        local sub_files=(
                Makefile.config.in
                Makefile.rules

diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
index 2e7bc9a..21f4f9d 100644
--- a/sys-devel/llvm/llvm-3.6.2.ebuild
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild
@@ -172,6 +172,9 @@ src_prepare() {
                        projects/compiler-rt/make/platform/clang_*.mk || die
        fi
 
+       # disable use of SDK on OSX, bug #568758
+       sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
        local sub_files=(
                Makefile.config.in
                Makefile.rules

diff --git a/sys-devel/llvm/llvm-3.7.1.ebuild b/sys-devel/llvm/llvm-3.7.1.ebuild
index d41de06..fa15adf 100644
--- a/sys-devel/llvm/llvm-3.7.1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1.ebuild
@@ -173,6 +173,9 @@ src_prepare() {
        # Fix msan with newer kernels, #569894
        epatch "${FILESDIR}"/llvm-3.7-msan-fix.patch
 
+       # disable use of SDK on OSX, bug #568758
+       sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
        if use clang; then
                # Automatically select active system GCC's libraries, bugs 
#406163 and #417913
                epatch 
"${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index bf42867..5820649 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -174,6 +174,9 @@ src_prepare() {
        # https://bugs.gentoo.org/show_bug.cgi?id=565358
        epatch "${FILESDIR}"/llvm-3.8-llvm-config.patch
 
+       # disable use of SDK on OSX, bug #568758
+       sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
        if use clang; then
                # Automatically select active system GCC's libraries, bugs 
#406163 and #417913
                epatch 
"${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch