From 11d68414e8fb0c019ed6f87e98c3c73161802608 Mon Sep 17 00:00:00 2001
From: Daniel <daniodudis1@gmail.com>
Date: Fri, 18 Oct 2019 20:31:00 +0200
Subject: [PATCH] update

---
 danio_gcc.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/danio_gcc.sh b/danio_gcc.sh
index e447eef..781b298 100755
--- a/danio_gcc.sh
+++ b/danio_gcc.sh
@@ -83,10 +83,6 @@ runit()
 			#(cd gcc-dl; ln -svf ../newlib-dl/newlib newlib; ln -svf ../newlib-dl/libgloss libgloss) || return ${?}
 			make -C build-gcc -j${nproc} all-target-libgcc || return ${?}
 			make -C build-gcc -j${nproc} install-target-libgcc || return ${?}
-			make -C build-gcc -j${nproc} all-target-libstdc++-v3 || return ${?}
-			make -C build-gcc -j${nproc} install-target-libstdc++-v3 || return ${?}
-			#make -C build-gcc -j${nproc} || return ${?}
-			#make -C build-gcc -j${nproc} install || return ${?}
 		else
 			mkdir -pv build-glibc || return ${?}
 			env CC="${TARGET}-gcc" CXX="${TARGET}-g++" sh -c '(cd build-glibc; ../glibc-dl/configure --prefix="${PREFIX}/${TARGET}" --host="${TARGET}" --with-headers="${PREFIX}/${TARGET}/include" --with-pkgversion="*DANiO* GLIBC (`echo ${TARGET} | cut -f 1 -d '-'`)" --enable-add-ons ${ARGS})' || return ${?}
@@ -100,9 +96,9 @@ runit()
 			make -C build-gcc -j${nproc} install-target-libgcc || return ${?}
 			make -C build-glibc -j${nproc} || return ${?}
 			make -C build-glibc -j${nproc} install || return ${?}
-			make -C build-gcc -j${nproc} all-target-libstdc++-v3 || return ${?}
-			make -C build-gcc -j${nproc} install-target-libstdc++-v3 || return ${?}
 		fi
+		make -C build-gcc -j${nproc} all-target-libstdc++-v3 || return ${?}
+		make -C build-gcc -j${nproc} install-target-libstdc++-v3 || return ${?}
 	}
 	strip_n_pack()
 	{
@@ -113,15 +109,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}) #|| return ${?}
+				(cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) #|| return ${?}
 			else
-				(cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?}
+				(cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-newlib-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| 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}) #|| return ${?}
+				(cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-64.txz" ${TARGET}) #|| return ${?}
 			else
-				(cd rel-bin; tar -cJvf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?}
+				(cd rel-bin; tar -cJf "${OUT}/${TARGET}-GCC_${gcc_version}-glibc-`date +"%d-%m-%Y"`-`uname -s`_x86-32.txz" ${TARGET}) #|| return ${?}
 			fi
 		fi
 	}
@@ -195,6 +191,11 @@ choose_sub()
 	done
 }
 
+if ! command -v jq >/dev/null; then
+	echo "jq command not found, please install it before using this application!"
+	exit 1
+fi
+
 targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`"
 if [ "${AUTOBUILD}" -ne "0" ]; then
 	export clean="1"
@@ -317,7 +318,7 @@ else
 		export glibc_version="master"
 		export linux_version="master"
 		export gcc_version="master"
-		export newlib_version="master"
 	fi
+	export newlib_version="master"
 	runit "${arch}-danio-${BASE}" "${BINARY}"
 fi