From 6e44c1ce0482c7756f5b839747e4209f9980c3c4 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 8 Nov 2019 21:10:27 +0100 Subject: [PATCH] fix --- danio_gcc.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/danio_gcc.sh b/danio_gcc.sh index b7db730..03f0a61 100755 --- a/danio_gcc.sh +++ b/danio_gcc.sh @@ -36,6 +36,13 @@ runit() export CXX="c++ -m32" ;; esac mkdir -pv out logs + echo "${glibc_version}" >.tmp + if grep -q "/" .tmp; then + export glibc_version_="`echo ${libc_version} | tr '/' '-'`" + else + export glibc_version_="${libc_version}" + fi + rm -rf .tmp #### TU NIE ZMIENIAJ ^^^ download() @@ -109,15 +116,15 @@ runit() find ${PREFIX}/${TARGET} -type f | xargs file | grep "ELF" | cut -f 1 -d ":" | xargs ${TARGET}-strip -S --strip-unneeded #for sysroot if [ "${buildnewlib}" -ne "0" ]; then if [ "${1}" = "64" ]; then - (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} + (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version_}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} else - (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} + (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version_}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} fi else if [ "${1}" = "64" ]; then - (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} + (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version_}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} else - (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} + (cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version_}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) | tee logs/${TARGET}-package.log || return ${?} fi fi }