diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index 15b2c1c365e..065733fd472 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -123,7 +123,7 @@ _glibc_headers() { --with-headers=${_CROSS_SYSROOT}/usr/include \ --config-cache \ --enable-obsolete-rpc \ - --enable-kernel=2.6.27 + --enable-kernel=2.6.27 make -k install-headers cross_compiling=yes \ install_root=${_CROSS_SYSROOT} @@ -153,7 +153,7 @@ _glibc_build() { --config-cache \ --enable-obsolete-rpc --disable-profile \ --enable-kernel=2.6.27 - + make ${makejobs} make install_root=${_CROSS_SYSROOT} install @@ -180,7 +180,7 @@ _gcc_build() { -i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so touch .sed_subst_done fi - + ../gcc-${_gcc_version}/configure \ --target=${_triplet} --prefix=/usr --libdir=/usr/lib \ --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \ @@ -250,11 +250,11 @@ do_install() { cd ${wrksrc}/glibc-build make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers - # Move files to /usr/lib (lib64). - if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then - mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/ - rmdir ${DESTDIR}/${_sysroot}/usr/lib64 - fi + # Move files to /usr/lib (lib64). + if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then + mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/ + rmdir ${DESTDIR}/${_sysroot}/usr/lib64 + fi # Remove unnecessary stuff rm -f ${DESTDIR}/usr/lib*/libiberty.a