summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xpkgtool.sh4
-rw-r--r--subr/ex_pkg.subr2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgtool.sh b/pkgtool.sh
index 41a0fde8..958e9e98 100755
--- a/pkgtool.sh
+++ b/pkgtool.sh
@@ -89,7 +89,7 @@ pkgtoolp_shell() {
rtl_log_msg info "Run \$R to rebuild \`%s'." "${_pkg_name}";
rtl_log_msg info "Run \$RS <step> to restart the specified build step of \`%s'" "${_pkg_name}";
rtl_log_msg info "Run \$D to automatically regenerate the patch for \`%s'." "${_pkg_name}";
- export ARCH BUILD \
+ export ARCH BUILD_KIND \
BUILD_DLCACHEDIR BUILD_WORKDIR \
MAKE="make LIBTOOL=${PKG_LIBTOOL:-slibtool}" \
MIDIPIX_BUILD_PWD \
@@ -172,7 +172,7 @@ pkgtoolp_update_diff() {
};
pkgtool() {
- local _rc=0 _status="" BUILD_GROUPS="" ARCH BUILD BUILD_WORKDIR PKGTOOL_PKGNAME PREFIX;
+ local _rc=0 _status="" BUILD_GROUPS="" ARCH BUILD_KIND BUILD_WORKDIR PKGTOOL_PKGNAME PREFIX;
if ! . "${0%/*}/subr/pkgtool_init.subr"; then
_rc=1; printf "Error: failed to source \`${0%/*}/subr/pkgtool_init.subr'." >&2;
elif ! pkgtool_init "${@}"; then
diff --git a/subr/ex_pkg.subr b/subr/ex_pkg.subr
index 8e7451d7..8df0e17f 100644
--- a/subr/ex_pkg.subr
+++ b/subr/ex_pkg.subr
@@ -78,7 +78,7 @@ ex_pkg_load_dump() {
if [ ! -e "${_workdir}/${_pkg_name}.dump" ]; then
rtl_log_msg warning "Warning: failed to locate environment dump for package \`%s' in \`%s'." "${_pkg_name}" "${_workdir}";
rtl_log_msg info "Rebuilding package \`%s' w/ --dump-in _build..." "${_pkg_name}";
- (export ARCH BUILD BUILD_DLCACHEDIR BUILD_WORKDIR \
+ (export ARCH BUILD_KIND BUILD_DLCACHEDIR BUILD_WORKDIR \
PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX \
PREFIX_NATIVE PREFIX_ROOT PREFIX_RPM;
./build.sh --dump-in _build -P -r "${_pkg_name}" -v);