daniel/danio_toolchain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update danio_gcc.sh

Browse Source
This commit is contained in:
Daniel
2019-12-14 23:44:07 +01:00
committed by GitHub
parent 797237008f
commit 890c29f566
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
danio_gcc.sh
+9 -21
View File
@@ -196,26 +196,21 @@ choose_sub()
done done
} }
[ -z "${binutils_version}" ] && export binutils_version="master"
[ -z "${glibc_version}" ] && export glibc_version="master"
[ -z "${linux_version}" ] && export linux_version="master"
[ -z "${gcc_version}" ] && export gcc_version="master"
[ -z "${newlib_version}" ] && export newlib_version="master"
targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`" targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`"
if [ "${1}" -a "${2}" ]; then if [ "${1}" -a "${2}" ]; then
[ -z "${binutils_version}" ] && export binutils_version="master"
[ -z "${glibc_version}" ] && export glibc_version="master"
[ -z "${linux_version}" ] && export linux_version="master"
[ -z "${gcc_version}" ] && export gcc_version="master"
[ -z "${newlib_version}" ] && export newlib_version="master"
if echo ${1} | grep -q "eabi"; then export buildnewlib="1" ;fi if echo ${1} | grep -q "eabi"; then export buildnewlib="1" ;fi
if echo ${1} | grep -q "elf"; then export buildnewlib="1" ;fi if echo ${1} | grep -q "elf"; then export buildnewlib="1" ;fi
target="echo ${1} | cut -d - -f1" target="`echo ${1} | cut -d - -f1`"
mach="`echo ${1} | cut -d - -f1`" mach="`echo ${1} | cut -d - -f2`"
runit "${target}-danio-${mach}" ${2} runit "${target}-danio-${mach}" ${2}
elif [ "${AUTOBUILD}" ]; then elif [ "${AUTOBUILD}" ]; then
export clean="1" export clean="1"
[ -z "${binutils_version}" ] && export binutils_version="master"
[ -z "${glibc_version}" ] && export glibc_version="master"
[ -z "${linux_version}" ] && export linux_version="master"
[ -z "${gcc_version}" ] && export gcc_version="master"
[ -z "${newlib_version}" ] && export newlib_version="master"
if [ "${METHOD}" = "newlib" ]; then if [ "${METHOD}" = "newlib" ]; then
export buildnewlib="1" export buildnewlib="1"
for i in ${targets}; do for i in ${targets}; do
@@ -293,7 +288,7 @@ else
*) echo "ONLY USE \"1\" or \"2\"!"; sleep 2 ;; *) echo "ONLY USE \"1\" or \"2\"!"; sleep 2 ;;
esac esac
done done
if [ "${CUSTOMBUILD}" -ne "0" ]; then if [ "${CUSTOMBUILD}" ]; then
while :; do while :; do
clear || reset clear || reset
echo "Please type gcc version or type \"master\" then press enter" echo "Please type gcc version or type \"master\" then press enter"
@@ -334,12 +329,5 @@ else
break break
fi fi
done done
else
[ -z "${binutils_version}" ] && export binutils_version="master"
[ -z "${glibc_version}" ] && export glibc_version="master"
[ -z "${linux_version}" ] && export linux_version="master"
[ -z "${gcc_version}" ] && export gcc_version="master"
fi
[ -z "${newlib_version}" ] && export newlib_version="master"
runit "${arch}-danio-${BASE}" "${BINARY}" runit "${arch}-danio-${BASE}" "${BINARY}"
fi fi