diff options
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index df3db2cc45..b6d80745cc 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -113,15 +113,15 @@ do_install_append () { | |||
113 | } | 113 | } |
114 | 114 | ||
115 | do_install_append_aarch64 () { | 115 | do_install_append_aarch64 () { |
116 | if [ "${base_libdir}" != "/lib" ] ; then | 116 | if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then |
117 | # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 | 117 | # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 |
118 | install -d ${D}/lib | 118 | install -d ${D}${nonarch_base_libdir} |
119 | if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then | 119 | if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then |
120 | ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \ | 120 | ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \ |
121 | ${D}/lib/ld-linux-aarch64.so.1 | 121 | ${D}${nonarch_base_libdir}/ld-linux-aarch64.so.1 |
122 | elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then | 122 | elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then |
123 | ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ | 123 | ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ |
124 | ${D}/lib/ld-linux-aarch64_be.so.1 | 124 | ${D}${nonarch_base_libdir}/ld-linux-aarch64_be.so.1 |
125 | fi | 125 | fi |
126 | fi | 126 | fi |
127 | do_install_armmultilib | 127 | do_install_armmultilib |