diff --git a/meta-openeuler/recipes-core/meta/meta-environment.bbappend b/meta-openeuler/recipes-core/meta/meta-environment.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..a1eccae7fd849894a4b4c1cdda136c8eccdc80a1 --- /dev/null +++ b/meta-openeuler/recipes-core/meta/meta-environment.bbappend @@ -0,0 +1 @@ +SDKPATHNATIVE = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}/" diff --git a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb index 1467031e5008e41bb28afb0c04c5c86a946e9038..4ba0b04304af1e2730dd52e881d849004866f254 100644 --- a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb +++ b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross-canadian.bb @@ -16,12 +16,22 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}" do_install() { install -m 0755 -d ${D}/${SDKTARGETSYSROOT}/ + #some files are under sysroot in compiler, need to copy to new sysroot + cp -pPR ${B}/sysroot/* ${D}/${SDKTARGETSYSROOT}/ cp -pPR ${B}/* ${D}/${SDKTARGETSYSROOT}/ + if [ ${TOOLCHAIN_PREFIX}- == ${TARGET_PREFIX} ]; then + return 0 + fi + for f in ${D}/${SDKTARGETSYSROOT}/bin/${TOOLCHAIN_PREFIX}-*; do + bin=$(basename ${f}) + lnk=$(basename ${f} | sed "s/^${TOOLCHAIN_PREFIX}-/${TARGET_PREFIX}/g") + ln -svf ${bin} ${D}/${SDKTARGETSYSROOT}/bin/${lnk} + done chown -R root:root ${D} } SYSROOT_DIRS = "" -INSANE_SKIP_${PN} += " already-stripped libdir staticdev dev-so" +INSANE_SKIP_${PN} += " already-stripped libdir staticdev dev-so infodir" FILES_${PN} = "/" PACKAGES = "${PN}"