summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-11-13 11:14:01 (EST)
committer P. J. McDermott <pjm@nac.net>2012-11-13 11:14:01 (EST)
commit25f46498fdee6e59f334a56d99b7e76d2a97ed82 (patch)
tree5e623ff52a7901a92105df65b5dd891f11b90ac5 /lib
parentd3308a72c42a2be520cfeca4f372119e46b64f76 (diff)
Return make's exit status.
Diffstat (limited to 'lib')
-rw-r--r--lib/buildsystem/make.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/buildsystem/make.sh b/lib/buildsystem/make.sh
index 20a74ae..f041e50 100644
--- a/lib/buildsystem/make.sh
+++ b/lib/buildsystem/make.sh
@@ -79,7 +79,7 @@ _oh_make_install()
_oh_make_update_first_defined_target()
{
- _oh_local _ohbsmufdt_targets _ohbsmufdt_target
+ _oh_local _ohbsmufdt_targets _ohbsmufdt_target _ohbsmufdt_rc
_ohbsmufdt_targets="${1}"
shift
@@ -89,12 +89,14 @@ _oh_make_update_first_defined_target()
if [ -z "${_ohbsmufdt_targets}" ]; then
make "${@}"
+ _ohbsmufdt_rc=${?}
else
for _ohbsmufdt_target in ${_ohbsmufdt_targets}; do
# If the target is defined, ...
if make -n "${_ohbsmufdt_target}" >/dev/null 2>&1; then
# ... then update it.
make "${@}" "${_ohbsmufdt_target}"
+ _ohbsmufdt_rc=${?}
break
fi
done
@@ -102,6 +104,6 @@ _oh_make_update_first_defined_target()
cd "${_OH_BUILDSYSTEM_WORK_AREA}"
- _oh_return 0
+ _oh_return ${_ohbsmufdt_rc}
return ${?}
}