diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2016-09-04 17:03:09 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2016-09-04 17:04:42 +0200 |
| commit | 159c9d730cdd4ed188ef9aa4ad9a36e322461ce2 (patch) | |
| tree | ecb7112fba57101fd262816593ba23145e595bc0 /sys-devel | |
| parent | mail-client/mutt: revbump for using correct patchset (diff) | |
| download | gentoo-159c9d730cdd4ed188ef9aa4ad9a36e322461ce2.tar.gz gentoo-159c9d730cdd4ed188ef9aa4ad9a36e322461ce2.tar.bz2 gentoo-159c9d730cdd4ed188ef9aa4ad9a36e322461ce2.zip | |
sys-devel/llvm: add patch for compiler-rt on Darwin/Prefix
Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch | 14 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-3.8.1.ebuild | 2 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-3.9.0.ebuild | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch b/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch new file mode 100644 index 000000000000..9122ce9bc79a --- /dev/null +++ b/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch @@ -0,0 +1,14 @@ +find_darwin_sdk_dir: fall back to / for sysroot + +--- a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -17,6 +17,9 @@ + ERROR_FILE /dev/null + ) + endif() ++ if("" STREQUAL "${var_internal}") ++ set(var_internal "/") ++ endif() + set(${var} ${var_internal} PARENT_SCOPE) + endfunction() + diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild index cc390c5fb7d4..8734298eca1e 100644 --- a/sys-devel/llvm/llvm-3.8.1.ebuild +++ b/sys-devel/llvm/llvm-3.8.1.ebuild @@ -185,6 +185,8 @@ src_prepare() { eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp + + eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ tools/clang/tools/scan-build/bin/scan-build || die diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild index 3752c6d98e94..9fde6d4dc9fc 100644 --- a/sys-devel/llvm/llvm-3.9.0.ebuild +++ b/sys-devel/llvm/llvm-3.9.0.ebuild @@ -181,6 +181,8 @@ src_prepare() { eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp + + eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch pushd "${S}"/tools/clang >/dev/null || die # be able to specify default values for -stdlib and -rtlib at build time |