Skip to contentSkip to conversation

external-arm-toolchain: fix C++ native compile, drop libc.so fix

PATCH New Denys Dmytriyenko 1 participant 1 message Apr 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 external-arm-toolchain: fix C++ native compile, drop libc.so fix

As libc.so fix is already upstream.

---
 meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta-arago-extras/recipes-core/meta/external-arm-toolchain.bbappend +1 -3
index 410b5cf..5cbeedf 100644
@@ -1,11 +1,9 @@
 ORIG_TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}"
 
 do_install_append() {
-	# libc.so linker script should use relative path to not clash with host libs
-	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
-
 	if [ ${EAT_TARGET_SYS} != ${ORIG_TARGET_SYS} ]; then
 		ln -sf ${EAT_TARGET_SYS} ${D}${libdir}/${ORIG_TARGET_SYS}
+		ln -sf ${EAT_TARGET_SYS} ${D}${includedir}/c++/${EAT_VER_GCC}/${ORIG_TARGET_SYS}
 	fi
 
 	ln -sf libatomic.so.1 ${D}${libdir}/libatomic.so
Signature · 1 line
2.7.4