From 981a63738ae634913c88920275828210779a9a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Tue, 21 Nov 2017 15:07:53 +0000
Subject: vars/build.vars: wake up disabled packages. vars/env.vars: fix
 ${DEFAULT_BUILD_CPUS} reference. vars/{gcc,libfirm,psxstub}.vars: fix
 ${PKG_MAKEFLAGS_BUILD} reference. vars/git.vars:pkg_git_install_post():
 process files in destdir. subr/pkg_install_libs.subr:pkgp_install_lib_link():
 ln(1) w/ target's basename. subr/pkg_install_libs.subr:pkg_install_libs():
 sanity-check filenames. subr/pkg_setup_env.subr:pkg_setup_env(): rm(1)
 ${PKG_BASE_DIR} during -r. etc/build.usage: updated.

---
 vars/gcc.vars | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'vars/gcc.vars')

diff --git a/vars/gcc.vars b/vars/gcc.vars
index 12902647..5391aeec 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -140,17 +140,17 @@ pkg_gcc_stage1_all() {
 		build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
-		make ${MAKEFLAGS} all-gcc;
+		make ${PKG_MAKEFLAGS_BUILD} all-gcc;
 		set_build_script_done "${PKG_NAME}" build -install;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
 		case "${PKG_NAME}" in
 		gcc_stage1)
-			make ${MAKEFLAGS} install-gcc; ;;
+			make ${PKG_MAKEFLAGS_BUILD} install-gcc; ;;
 		gcc_stage1_cross_x86_64_w64_mingw32)
-			make ${MAKEFLAGS} install-gcc; ;;
+			make ${PKG_MAKEFLAGS_BUILD} install-gcc; ;;
 		gcc_stage1_native_x86_64_w64_mingw32)
-			make ${MAKEFLAGS} "DESTDIR=${PKG_PREFIX}" install-gcc; ;;
+			make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" install-gcc; ;;
 		esac;
 		__="$(uname -s)";
 		if [ "${__#*CYGWIN*}" != "${__}" ]; then
@@ -169,11 +169,11 @@ pkg_gcc_runtime_all() {
 	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, compiler runtime.
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
-		make ${MAKEFLAGS} all-target-libgcc;
+		make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc;
 		set_build_script_done "${PKG_NAME}" build -install;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
-		make ${MAKEFLAGS} install-target-libgcc;
+		make ${PKG_MAKEFLAGS_BUILD} install-target-libgcc;
 		set_build_script_done "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
@@ -186,11 +186,11 @@ pkg_gcc_libstdcpp_v3_all() {
 	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, libstdc++-v3.
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
-		make ${MAKEFLAGS} all-target-libstdc++-v3;
+		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
 		set_build_script_done "${PKG_NAME}" build -install;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
-		make ${MAKEFLAGS} install-target-libstdc++-v3;
+		make ${PKG_MAKEFLAGS_BUILD} install-target-libstdc++-v3;
 		set_build_script_done "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
@@ -203,11 +203,11 @@ pkg_gcc_full_all() {
 	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, everything else.
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
-		make ${MAKEFLAGS};
+		make ${PKG_MAKEFLAGS_BUILD};
 		set_build_script_done "${PKG_NAME}" build -install;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
-		make ${MAKEFLAGS} install;
+		make ${PKG_MAKEFLAGS_BUILD} install;
 		set_build_script_done "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
@@ -243,14 +243,14 @@ pkg_gcc_native_all() {
 		build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
-		make ${MAKEFLAGS} all-gcc;
-		make ${MAKEFLAGS} all-target-libgcc;
-		make ${MAKEFLAGS} all-target-libstdc++-v3;
-		make ${MAKEFLAGS} all;
+		make ${PKG_MAKEFLAGS_BUILD} all-gcc;
+		make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc;
+		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
+		make ${PKG_MAKEFLAGS_BUILD} all;
 		set_build_script_done "${PKG_NAME}" build -install;
 	fi;
 	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
-		make ${MAKEFLAGS} "DESTDIR=${PKG_PREFIX}" install;
+		make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" install;
 		set_build_script_done "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
-- 
cgit v1.2.3