|
Line 0
Link Here
|
|
|
1 |
--- a/cmake/Modules/HandleCompilerRT.cmake 2018-10-26 19:17:14.955186526 -0000 |
|
Lines 50-55
PATCHES=(
Link Here
|
| 50 |
# Fix installing when using libsupc++ backend. |
50 |
# Fix installing when using libsupc++ backend. |
| 51 |
# https://bugs.gentoo.org/667174 |
51 |
# https://bugs.gentoo.org/667174 |
| 52 |
"${FILESDIR}/${PN}-7.0.0-libsupcxx-install.patch" |
52 |
"${FILESDIR}/${PN}-7.0.0-libsupcxx-install.patch" |
|
|
53 |
|
| 54 |
# Fix compiler-rt detection and linking while linking against libunwind |
| 55 |
# https://bugs.gentoo.org/592326 |
| 56 |
"${FILESDIR}/${PN}-${PV}-fix-compiler-rt-detection.patch" |
| 53 |
) |
57 |
) |
| 54 |
|
58 |
|
| 55 |
# least intrusive of all |
59 |
# least intrusive of all |
|
Lines 104-110
src_configure() {
Link Here
|
| 104 |
multilib_src_configure() { |
108 |
multilib_src_configure() { |
| 105 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
109 |
# we want -lgcc_s for unwinder, and for compiler runtime when using |
| 106 |
# gcc, clang with gcc runtime (or any unknown compiler) |
110 |
# gcc, clang with gcc runtime (or any unknown compiler) |
| 107 |
local extra_libs=() want_gcc_s=ON |
111 |
local extra_libs=() use_compiler_rt=OFF |
| 108 |
if use libunwind; then |
112 |
if use libunwind; then |
| 109 |
# work-around missing -lunwind upstream |
113 |
# work-around missing -lunwind upstream |
| 110 |
extra_libs+=( -lunwind ) |
114 |
extra_libs+=( -lunwind ) |
|
Lines 114-121
multilib_src_configure() {
Link Here
|
| 114 |
local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
118 |
local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
| 115 |
${LDFLAGS} -print-libgcc-file-name) |
119 |
${LDFLAGS} -print-libgcc-file-name) |
| 116 |
if [[ ${compiler_rt} == *libclang_rt* ]]; then |
120 |
if [[ ${compiler_rt} == *libclang_rt* ]]; then |
| 117 |
want_gcc_s=OFF |
121 |
use_compiler_rt=ON |
| 118 |
extra_libs+=( "${compiler_rt}" ) |
|
|
| 119 |
fi |
122 |
fi |
| 120 |
fi |
123 |
fi |
| 121 |
fi |
124 |
fi |
|
Lines 139-145
multilib_src_configure() {
Link Here
|
| 139 |
# we're using our own mechanism for generating linker scripts |
142 |
# we're using our own mechanism for generating linker scripts |
| 140 |
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
143 |
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 141 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
144 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 142 |
-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
145 |
-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt} |
| 143 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
146 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 144 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
147 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 145 |
) |
148 |
) |
| 146 |
- |
|
|
