diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-15 12:44:26 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-15 12:44:26 +0000 |
| commit | e1d4697bc4af580c8bbdb8256fdc90626e18a226 (patch) | |
| tree | 99c4cf49c4ba57d83bb03512bce0a89a0ac9d9f3 /subr/pkg_install_make.subr | |
| parent | b6a9a1a3c8b98077cce47d579069c42080d17da5 (diff) | |
| download | midipix_build-e1d4697bc4af580c8bbdb8256fdc90626e18a226.tar.bz2 midipix_build-e1d4697bc4af580c8bbdb8256fdc90626e18a226.tar.xz | |
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.
Diffstat (limited to 'subr/pkg_install_make.subr')
| -rw-r--r-- | subr/pkg_install_make.subr | 24 |
1 files changed, 15 insertions, 9 deletions
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 |