From a9f452c3ce16b9e3ac9dcc993d1641ade1049e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Sun, 26 Mar 2023 13:24:19 +0200
Subject: vars/{gcc,libfirm,psxstub_host}.vars: correctly expand
 ${PKG_MAKEFLAGS_BUILD:-}.

---
 vars/gcc.vars | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'vars/gcc.vars')

diff --git a/vars/gcc.vars b/vars/gcc.vars
index fc7c4062..d07e72ad 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -225,7 +225,7 @@ pkgp_gcc_stage1_all() {
 	fi;
 
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
-		make ${PKG_MAKEFLAGS_BUILD} "all-gcc" || return 1;
+		make ${PKG_MAKEFLAGS_BUILD:-} "all-gcc" || return 1;
 		pkgp_gcc_state_set "build" "install_subdirs";
 	fi;
 
@@ -238,13 +238,13 @@ pkgp_gcc_stage1_all() {
 		case "${PKG_NAME}" in
 
 		gcc_stage1_cross_mingw32)
-			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-gcc"; ;;
+			make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-gcc"; ;;
 
 		gcc_stage1_host)
-			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-gcc"; ;;
+			make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-gcc"; ;;
 
 		gcc_stage1_native_mingw32)
-			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-gcc"; ;;
+			make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-gcc"; ;;
 
 		esac;
 
@@ -332,11 +332,11 @@ pkg_gcc_full_all() {
 	fi;
 
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
-		if ! make ${PKG_MAKEFLAGS_BUILD} "all-gcc"\
-		|| ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libgcc" ${_vis_hide}\
-		|| ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libstdc++-v3"\
-		|| ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libgfortran"\
-		|| ! make ${PKG_MAKEFLAGS_BUILD} "all"; then
+		if ! make ${PKG_MAKEFLAGS_BUILD:-} "all-gcc"\
+		|| ! make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libgcc" ${_vis_hide}\
+		|| ! make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libstdc++-v3"\
+		|| ! make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libgfortran"\
+		|| ! make ${PKG_MAKEFLAGS_BUILD:-} "all"; then
 			return 1;
 		else	pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
@@ -348,7 +348,7 @@ pkg_gcc_full_all() {
 	fi;
 
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
-		make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1;
+		make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install" || return 1;
 		pkgp_gcc_state_set "install_make" "install";
 	fi;
 
@@ -371,7 +371,7 @@ pkg_gcc_full_host_all() {
 		return 1;
 	else
 		if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
-			make ${PKG_MAKEFLAGS_BUILD} || return 1;
+			make ${PKG_MAKEFLAGS_BUILD:-} || return 1;
 			pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 
@@ -381,7 +381,7 @@ pkg_gcc_full_host_all() {
 		fi;
 
 		if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
-			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1;
+			make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install" || return 1;
 			pkgp_gcc_state_set "install_make" "install";
 		fi;
 
@@ -405,7 +405,7 @@ pkg_gcc_libstdcpp_v3_host_all() {
 		return 1;
 	else
 		if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
-			make ${PKG_MAKEFLAGS_BUILD} "all-target-libstdc++-v3" || return 1;
+			make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libstdc++-v3" || return 1;
 			pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 
@@ -415,7 +415,7 @@ pkg_gcc_libstdcpp_v3_host_all() {
 		fi;
 
 		if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
-			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libstdc++-v3" || return 1;
+			make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-target-libstdc++-v3" || return 1;
 			pkgp_gcc_state_set "install_make" "install";
 		fi;
 
@@ -440,7 +440,7 @@ pkg_gcc_runtime_host_all() {
 		return 1;
 	else
 		if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
-			make ${PKG_MAKEFLAGS_BUILD} "all-target-libgcc" ${_vis_hide} || return 1;
+			make ${PKG_MAKEFLAGS_BUILD:-} "all-target-libgcc" ${_vis_hide} || return 1;
 			pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 
@@ -450,7 +450,7 @@ pkg_gcc_runtime_host_all() {
 		fi;
 
 		if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
-			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libgcc" || return 1;
+			make ${PKG_MAKEFLAGS_BUILD:-} "prefix=${PKG_DESTDIR}" "install-target-libgcc" || return 1;
 			pkgp_gcc_state_set "install_make" "install";
 		fi;
 
-- 
cgit v1.2.3