diff --git a/danio_gcc.sh b/danio_gcc.sh
index 387cc62..99db1a5 100755
--- a/danio_gcc.sh
+++ b/danio_gcc.sh
@@ -11,6 +11,7 @@ runit()
 	export PREFIX="`pwd`/rel-bin/${TARGET}"
 	export PATH="${PREFIX}/bin:${PATH}"
 	export OUT="`pwd`/out"
+	export ARGS="--enable-multilib --enable-multiarch --enable-targets=all --disable-werror"
 	if command -v nproc --version >/dev/null; then
 		export nproc="$(( `nproc --all` * 2 ))"
 	elif command -v sysctl >/dev/null; then
@@ -19,10 +20,14 @@ runit()
 		#domyslnie dwa rdzenie
 		export nproc="2"
 	fi
-	export ARGS="--enable-multilib --enable-multiarch --enable-targets=all --disable-werror"
 	if [ "${buildnewlib}" -ne "0" ]; then
 		export EXTRA_ARGS="--with-newlib"
 	fi
+	if commmand -v gmake >/dev/null; then
+		export make="gmake"
+	else
+		export make="make"
+	fi
 	case "${2}" in
 	64)
 		export CC="cc -m64"
@@ -60,46 +65,46 @@ runit()
 	build()
 	{
 		if [ "${buildnewlib}" -eq "0" ]; then
-			make -C linux-dl ARCH="`echo ${TARGET} | cut -f 1 -d '-' | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ -e s/riscv.*/riscv/`" INSTALL_HDR_PATH="${PREFIX}/${TARGET}" headers_install | tee -i logs/${TARGET}-linux-headers.log || return ${?}
+			${make} -C linux-dl ARCH="`echo ${TARGET} | cut -f 1 -d '-' | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ -e s/riscv.*/riscv/`" INSTALL_HDR_PATH="${PREFIX}/${TARGET}" headers_install | tee -i logs/${TARGET}-linux-headers.log || return ${?}
 			find ${PREFIX}/${TARGET} -name "..install.cmd" | xargs rm -rf || return ${?}
 			find ${PREFIX}/${TARGET} -name ".install" | xargs rm -rf || return ${?}
 		fi
 		mkdir -pv build-binutils || return ${?}
 		(cd build-binutils; ../binutils-gdb-dl/configure --target="${TARGET}" --prefix="${PREFIX}" --disable-nls --enable-obsolete --disable-debug ${ARGS}) | tee -i logs/${TARGET}-configure-binutils.log || return ${?}
-		make -C build-binutils -j${nproc} | tee -i logs/${TARGET}-build-binutils.log || return ${?}
-		make -C build-binutils -j${nproc} install | tee -i logs/${TARGET}-install-binutils.log || return ${?}
+		${make} -C build-binutils -j${nproc} | tee -i logs/${TARGET}-build-binutils.log || return ${?}
+		${make} -C build-binutils -j${nproc} install | tee -i logs/${TARGET}-install-binutils.log || return ${?}
 		if [ ! -e gcc-dl/.dl_ok ]; then
 			(cd gcc-dl; contrib/download_prerequisites) | tee -i logs/${TARGET}-gcc-dl-prerequisites.log || return ${?}
 			touch gcc-dl/.dl_ok || return ${?}
 		fi
 		mkdir -pv build-gcc || return ${?}
 		(cd build-gcc; ../gcc-dl/configure --target="${TARGET}" --prefix="${PREFIX}" --enable-languages="c,c++" --with-pkgversion="*DANiO* GCC (`echo ${TARGET} | cut -f 1 -d '-'`)" ${ARGS} ${EXTRA_ARGS}) | tee -i logs/${TARGET}-configure-gcc.log || return ${?}
-		make -C build-gcc -j${nproc} all-gcc | tee -i logs/${TARGET}-gcc-all-gcc.log || return ${?}
-		make -C build-gcc -j${nproc} install-gcc | tee -i logs/${TARGET}-gcc-install-gcc.log || return ${?}
+		${make} -C build-gcc -j${nproc} all-gcc | tee -i logs/${TARGET}-gcc-all-gcc.log || return ${?}
+		${make} -C build-gcc -j${nproc} install-gcc | tee -i logs/${TARGET}-gcc-install-gcc.log || return ${?}
 		if [ "${buildnewlib}" -ne "0" ]; then
 			mkdir -pv build-newlib || return ${?}
 			(cd build-newlib; ../newlib-dl/configure --prefix="${PREFIX}" --target="${TARGET}" ${ARGS}) | tee -i logs/${TARGET}-configure-newlib.log || return ${?}
-			make -C build-newlib -j${nproc} | tee -i logs/${TARGET}-build-newlib.log || return ${?}
-			make -C build-newlib -j${nproc} install | tee -i logs/${TARGET}-install-newlib.log || return ${?} 
+			${make} -C build-newlib -j${nproc} | tee -i logs/${TARGET}-build-newlib.log || return ${?}
+			${make} -C build-newlib -j${nproc} install | tee -i logs/${TARGET}-install-newlib.log || return ${?} 
 			#(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 | tee -i logs/${TARGET}-gcc-all-target-libgcc.log || return ${?}
-			make -C build-gcc -j${nproc} install-target-libgcc | tee -i logs/${TARGET}-gcc-install-target-libgcc.log || return ${?}
+			${make} -C build-gcc -j${nproc} all-target-libgcc | tee -i logs/${TARGET}-gcc-all-target-libgcc.log || return ${?}
+			${make} -C build-gcc -j${nproc} install-target-libgcc | tee -i logs/${TARGET}-gcc-install-target-libgcc.log || 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})' | tee -i logs/${TARGET}-configure-glibc.log || return ${?}
-			make -C build-glibc -j${nproc} install-bootstrap-headers=yes install-headers | tee -i logs/${TARGET}-bootstrap-headers-glibc.log || return ${?}
-			make -C build-glibc -j${nproc} csu/subdir_lib | tee -i logs/${TARGET}-build-glibc-csu.log || return ${?}
+			${make} -C build-glibc -j${nproc} install-bootstrap-headers=yes install-headers | tee -i logs/${TARGET}-bootstrap-headers-glibc.log || return ${?}
+			${make} -C build-glibc -j${nproc} csu/subdir_lib | tee -i logs/${TARGET}-build-glibc-csu.log || return ${?}
 			mkdir -pv ${PREFIX}/${TARGET}/lib || return ${?}
 			cp -ravf build-glibc/csu/crt1.o build-glibc/csu/crti.o build-glibc/csu/crtn.o ${PREFIX}/${TARGET}/lib | tee -i logs/${TARGET}-install-csu.log || return ${?}
 			#${TARGET}-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o ${PREFIX}/${TARGET}/lib/libc.so || return ${?}
 			touch ${PREFIX}/${TARGET}/include/gnu/stubs.h || return ${?}
-			make -C build-gcc -j${nproc} all-target-libgcc | tee -i logs/${TARGET}-gcc-all-target-libgcc.log || return ${?}
-			make -C build-gcc -j${nproc} install-target-libgcc | tee -i logs/${TARGET}-gcc-install-target-libgcc.log || return ${?}
-			make -C build-glibc -j${nproc} | tee -i logs/${TARGET}-build-glibc.log || return ${?}
-			make -C build-glibc -j${nproc} install | tee -i logs/${TARGET}-install-glibc.log || return ${?}
+			${make} -C build-gcc -j${nproc} all-target-libgcc | tee -i logs/${TARGET}-gcc-all-target-libgcc.log || return ${?}
+			${make} -C build-gcc -j${nproc} install-target-libgcc | tee -i logs/${TARGET}-gcc-install-target-libgcc.log || return ${?}
+			${make} -C build-glibc -j${nproc} | tee -i logs/${TARGET}-build-glibc.log || return ${?}
+			${make} -C build-glibc -j${nproc} install | tee -i logs/${TARGET}-install-glibc.log || return ${?}
 		fi
-		make -C build-gcc -j${nproc} all-target-libstdc++-v3 | tee -i logs/${TARGET}-gcc-all-target-libstdc++-v3.log || return ${?}
-		make -C build-gcc -j${nproc} install-target-libstdc++-v3 | tee -i logs/${TARGET}-gcc-install-target-libstdc++-v3.log || return ${?}
+		${make} -C build-gcc -j${nproc} all-target-libstdc++-v3 | tee -i logs/${TARGET}-gcc-all-target-libstdc++-v3.log || return ${?}
+		${make} -C build-gcc -j${nproc} install-target-libstdc++-v3 | tee -i logs/${TARGET}-gcc-install-target-libstdc++-v3.log || return ${?}
 	}
 	strip_n_pack()
 	{