| 1 |
commit: 159c9d730cdd4ed188ef9aa4ad9a36e322461ce2 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 4 15:03:09 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 15:04:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159c9d73 |
| 7 |
|
| 8 |
sys-devel/llvm: add patch for compiler-rt on Darwin/Prefix |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
.../files/3.8.1/compiler-rt/darwin-default-sysroot.patch | 14 ++++++++++++++ |
| 13 |
sys-devel/llvm/llvm-3.8.1.ebuild | 2 ++ |
| 14 |
sys-devel/llvm/llvm-3.9.0.ebuild | 2 ++ |
| 15 |
3 files changed, 18 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..9122ce9 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-devel/llvm/files/3.8.1/compiler-rt/darwin-default-sysroot.patch |
| 22 |
@@ -0,0 +1,14 @@ |
| 23 |
+find_darwin_sdk_dir: fall back to / for sysroot |
| 24 |
+ |
| 25 |
+--- a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake |
| 26 |
++++ b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake |
| 27 |
+@@ -17,6 +17,9 @@ |
| 28 |
+ ERROR_FILE /dev/null |
| 29 |
+ ) |
| 30 |
+ endif() |
| 31 |
++ if("" STREQUAL "${var_internal}") |
| 32 |
++ set(var_internal "/") |
| 33 |
++ endif() |
| 34 |
+ set(${var} ${var_internal} PARENT_SCOPE) |
| 35 |
+ endfunction() |
| 36 |
+ |
| 37 |
|
| 38 |
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 39 |
index cc390c5..8734298 100644 |
| 40 |
--- a/sys-devel/llvm/llvm-3.8.1.ebuild |
| 41 |
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild |
| 42 |
@@ -185,6 +185,8 @@ src_prepare() { |
| 43 |
|
| 44 |
eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch |
| 45 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 46 |
+ |
| 47 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch |
| 48 |
|
| 49 |
sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ |
| 50 |
tools/clang/tools/scan-build/bin/scan-build || die |
| 51 |
|
| 52 |
diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild |
| 53 |
index 3752c6d..9fde6d4 100644 |
| 54 |
--- a/sys-devel/llvm/llvm-3.9.0.ebuild |
| 55 |
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild |
| 56 |
@@ -181,6 +181,8 @@ src_prepare() { |
| 57 |
|
| 58 |
eapply "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch |
| 59 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
| 60 |
+ |
| 61 |
+ eapply "${FILESDIR}"/3.8.1/compiler-rt/darwin-default-sysroot.patch |
| 62 |
|
| 63 |
pushd "${S}"/tools/clang >/dev/null || die |
| 64 |
# be able to specify default values for -stdlib and -rtlib at build time |
Archives