From e1d4697bc4af580c8bbdb8256fdc90626e18a226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 15 Mar 2020 12:44:26 +0000
Subject: Set -o nounset in addition to +o errexit -o nounset.

groups/000.host_tools.group:libtool_host:${PKG_LIBTOOL}: build w/ `none'.
subr/build_init.subr:buildp_init_getopts(): set ${DEFAULT_BUILD_CPUS} prior to ex_pkg_load_vars() call.
subr/pkg_{build,install_make}.subr: only pass `LIBTOOL=${PKG_LIBTOOL}' if set and not `none'.
vars/libtool_host.vars: removes obsolete vars file.
---
 subr/pkg_install_make.subr | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'subr/pkg_install_make.subr')

diff --git a/subr/pkg_install_make.subr b/subr/pkg_install_make.subr
index 4babac8f..a5e58f60 100644
--- a/subr/pkg_install_make.subr
+++ b/subr/pkg_install_make.subr
@@ -1,16 +1,22 @@
 #
-# set +o errexit -o noglob is assumed.
+# set +o errexit -o noglob -o nounset is assumed.
 #
 
 pkg_install_make() {
-	rtl_run_cmd_unsplit make							\
-		${PKG_MAKEFLAGS_INSTALL}						\
-		${PKG_MAKEFLAGS_INSTALL_EXTRA}						\
-		AR=${PKG_AR} CC=${PKG_CC} RANLIB=${PKG_RANLIB}				\
-		"${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}"			\
-		"LIBTOOL=${PKG_LIBTOOL:-slibtool}"					\
-		"${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/"			\
-		${PKG_INSTALL_TARGET:=install};
+	local _libtool="";
+	case "${PKG_LIBTOOL:-}" in
+	"")	_libtool=""; ;;
+	none)	_libtool=""; ;;
+	*)	_libtool="${PKG_LIBTOOL}"; ;;
+	esac;
+	rtl_run_cmd_unsplit make					\
+		${PKG_MAKEFLAGS_INSTALL:-}				\
+		${PKG_MAKEFLAGS_INSTALL_EXTRA:-}			\
+		AR="${PKG_AR}" CC="${PKG_CC}" RANLIB="${PKG_RANLIB}"	\
+		"${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}"	\
+		${_libtool:+"LIBTOOL=${_libtool}"}			\
+		"${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/"	\
+		${PKG_INSTALL_TARGET:-install};
 };
 
 # vim:filetype=sh
-- 
cgit v1.2.3