__stripfile() strips ${_file} only when value of ${OPT_DEBUG} is zero
and length of ${HAVE_STRIP} is nonzero. However, HAVE_STRIP is set in
mk/make-config.sh but not written to mk-config.mk. Therefore
__stripfile() never strips ${_file} in any cases. So change logic of
__stripfile() so it strips ${_file} only when value of ${OPT_DEBUG} is
zero and length of ${strip} is nonzero.
---
mk/make-config.sh | 2 +-
mk/make-install.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mk/make-config.sh b/mk/make-config.sh
index 80f40420..d3db273d 100644
--- a/mk/make-config.sh
+++ b/mk/make-config.sh
@@ -1356,7 +1356,7 @@ PATH=${__PATH}
thecmd_testandset_fail MAKE make
make=${MAKE}
export MAKE
-thecmd_testandset strip strip && HAVE_STRIP=1 || HAVE_STRIP=0
+thecmd_testandset strip strip
# For ./mx-test.sh only
thecmd_testandset_fail cksum cksum
diff --git a/mk/make-install.sh b/mk/make-install.sh
index 4d606138..2a553299 100644
--- a/mk/make-install.sh
+++ b/mk/make-install.sh
@@ -32,7 +32,7 @@ __copychownfile() {
__stripfile() {
_file=${1}
if [ "${OPT_DEBUG}" != 0 ]; then :;
- elif [ -n "${HAVE_STRIP}" ]; then
+ elif [ -n "${strip}" ]; then
${strip} "${_file}"
fi
}
--
2.23.0
