From c89b485eeab39f85f4ae0eb84cd396b82e84baac Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 20 Oct 2018 01:33:15 +0200 Subject: [PATCH] update --- danio_gcc.sh | 13 ++++++++++++- runit-all.sh | 10 ++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/danio_gcc.sh b/danio_gcc.sh index 033a3fa..f803d6a 100644 --- a/danio_gcc.sh +++ b/danio_gcc.sh @@ -3,6 +3,17 @@ export PREFIX="`pwd`/rel-bin/${TARGET}" export PATH="${PREFIX}/bin:${PATH}" export OUT="`pwd`/out" +if [ "${1}" == "64" ]; then + export CC="cc -m64" + export CXX="c++ -m64" +elif [ "${1}" == "32" ] + export CC="cc -m32" + export CXX="c++ -m32" +else + export CC="cc" + export CXX="c++" +fi + #### JEŚLI BĘDĄ NOWE WERSJE BINUTILS'A i GCC PROSZĘ ZMIENIĆ NUMER!!! export binutils_version="2.31" #TU ZMIENIAMY! export newlib_version="3.0.0" #TU ZMIENIAMY! @@ -83,7 +94,7 @@ if ( then find ${PREFIX} | xargs file | grep "ELF" | grep "executable" | cut -f 1 -d ":" | xargs strip -S 2>/dev/null mkdir -pv out - if [ "${CC}" == "cc -m64" ]; then + if [ "${1}" == "64" ]; then (cd ${PREFIX}; tar -cJf "${OUT}/${TARGET}-`date +"%d-%m-%Y"`_x86-64.txz" .) else (cd ${PREFIX}; tar -cJf "${OUT}/${TARGET}-`date +"%d-%m-%Y"`_x86-32.txz" .) diff --git a/runit-all.sh b/runit-all.sh index 4881716..58282e9 100644 --- a/runit-all.sh +++ b/runit-all.sh @@ -27,14 +27,8 @@ fi mkdir -p out case ${1} in -64) - export CC="cc -m64" - export CXX="c++ -m64" - build ;; -32) - export CC="cc -m32" - export CXX="c++ -m32" - build ;; +64) build 64;; +32) build 32;; --build-upload) ${0} 64 && ${0} 32 && surge ./out gcc.danio.ga ;; --build) ${0} 64 && ${0} 32 ;; esac