build.sh, {subr,vars}/*: general cleanup.

1 files changed, 33 insertions, 34 deletions

diff --git a/vars/gcc.vars b/vars/gcc.vars
index 9d5f82b9..69d02b28 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -1,10 +1,11 @@
 #
-# . ./build.vars and set -o errexit -o noglob are assumed.
+# set -o errexit -o noglob are assumed.
 # Order: stage1, runtime, libstdcpp_v3, full, native
 # Order: stage1_x86_64_w64_mingw32, native_x86_64_w64_mingw32
 #
 
 pkgp_gcc_setup_env() {
+	local __;
 	export MAKE="make LIBTOOL=slibtool";
 	export	cbb_ldflags_for_target=--sysroot=${PKG_PREFIX}	\
 		cbb_sysroot_for_libgcc=${PKG_PREFIX}		\
@@ -63,7 +64,7 @@ pkgp_gcc_configure() {
 		--enable-threads=posix			\
 		--target=${PKG_TARGET}			\
 		--with-fpmath=sse;
-	set_build_script_done configure clean -build;
+	set_build_script_done ${PKG_NAME} configure -build;
 };
 
 pkg_gcc_stage1_cross_x86_64_w64_mingw32_all() {
@@ -75,6 +76,7 @@ pkg_gcc_stage1_native_x86_64_w64_mingw32_all() {
 };
 
 pkg_gcc_stage1_all() {
+	local __;
 	case ${PKG_NAME} in
 	gcc_stage1)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_VERSION}";
@@ -90,12 +92,12 @@ pkg_gcc_stage1_all() {
 		;;
 	esac;
 	# GCC, stage1.
-	if ! is_build_script_done fetch; then
+	if ! is_build_script_done ${PKG_NAME} fetch; then
 		pkg_fetch -git "cbb-gcc-${PKG_GCC_VERSION}=${GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}";
-		set_build_script_done fetch -configure;
+		set_build_script_done ${PKG_NAME} fetch -configure;
 	fi;
 	pkgp_gcc_setup_env ${PKG_GCC_VERSION};
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		build_fileop mkdir ${PKG_PREFIX}/include;
 		[ \! -d ${PKG_PREFIX}/usr ] &&			\
 			build_fileop ln_symbolic . ${PKG_PREFIX}/usr;
@@ -128,15 +130,11 @@ pkg_gcc_stage1_all() {
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-gcc;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		case ${PKG_NAME} in
 		gcc_stage1)
 			make ${MAKEFLAGS} install-gcc; ;;
@@ -150,8 +148,9 @@ pkg_gcc_stage1_all() {
 			build_fileop ln_symbolic ${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.dll.a	\
 				build_fileop ln_symbolic ${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.so;
 		fi;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_runtime_all() {
@@ -159,14 +158,15 @@ pkg_gcc_runtime_all() {
 	set_build_dir cbb-gcc-${PKG_GCC_RUNTIME_VERSION} cross;
 	build_fileop cd ${PKG_BUILD_DIR};
 	# GCC, compiler runtime.
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-target-libgcc;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} install-target-libgcc;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_libstdcpp_v3_all() {
@@ -174,14 +174,15 @@ pkg_gcc_libstdcpp_v3_all() {
 	set_build_dir cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION} cross;
 	build_fileop cd ${PKG_BUILD_DIR};
 	# GCC, libstdc++-v3.
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-target-libstdc++-v3;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} install-target-libstdc++-v3;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_full_all() {
@@ -189,14 +190,15 @@ pkg_gcc_full_all() {
 	set_build_dir cbb-gcc-${PKG_GCC_FULL_VERSION} cross;
 	build_fileop cd ${PKG_BUILD_DIR};
 	# GCC, everything else.
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS};
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} install;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 pkg_gcc_native_all() {
@@ -205,7 +207,7 @@ pkg_gcc_native_all() {
 	# GCC, native.
 	set_build_dir cbb-gcc-${PKG_GCC_VERSION} native;
 	pkgp_gcc_setup_env ${PKG_GCC_VERSION};
-	if ! is_build_script_done configure; then
+	if ! is_build_script_done ${PKG_NAME} configure; then
 		build_fileop mkdir ${PKG_PREFIX}/${PKG_TARGET};
 		if [ \! -d ${PKG_PREFIX}/${PKG_TARGET}/usr ]; then
 			build_fileop ln_symbolic . ${PKG_PREFIX}/${PKG_TARGET}/usr;
@@ -227,21 +229,18 @@ pkg_gcc_native_all() {
 	else
 		build_fileop cd ${PKG_BUILD_DIR};
 	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
+	if ! is_build_script_done ${PKG_NAME} build; then
 		make ${MAKEFLAGS} all-gcc;
 		make ${MAKEFLAGS} all-target-libgcc;
 		make ${MAKEFLAGS} all-target-libstdc++-v3;
 		make ${MAKEFLAGS} all;
-		set_build_script_done build -install;
+		set_build_script_done ${PKG_NAME} build -install;
 	fi;
-	if ! is_build_script_done install; then
+	if ! is_build_script_done ${PKG_NAME} install; then
 		make ${MAKEFLAGS} DESTDIR=${PKG_PREFIX} install;
-		set_build_script_done install finish;
+		set_build_script_done ${PKG_NAME} install finish;
 	fi;
+	exit 0;
 };
 
 # vim:filetype=sh