summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-05-26 17:19:49 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-05-26 17:19:49 (EDT)
commite8533e6b128735f055d9487f21e1041f225103d9 (patch)
treea1b132902f0928cd11fbbd7182ac40106a0def58
parent03dc6367801b0b27910349b38af4ef05ba7c4aa5 (diff)
oh_buildsystem_arch(): Accept build system as arg.
-rw-r--r--lib/buildsystem.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/buildsystem.sh b/lib/buildsystem.sh
index cfb92d8..cc910b8 100644
--- a/lib/buildsystem.sh
+++ b/lib/buildsystem.sh
@@ -142,17 +142,19 @@ oh_buildsystem_arch()
if [ ${#} -eq 1 ]; then
_ohbsa_arch="${1}"
+ _ohbsa_system="$(oh_buildsystem_find 'configure')"
+ if [ ${?} -ne 0 ]; then
+ _oh_return 1
+ return ${?}
+ fi
+ elif [ ${#} -eq 2 ]; then
+ _ohbsa_arch="${1}"
+ _ohbsa_system="${2}"
else
_oh_return 125
return ${?}
fi
- _ohbsa_system="$(oh_buildsystem_find 'configure')"
- if [ ${?} -ne 0 ]; then
- _oh_return 1
- return ${?}
- fi
-
# Try to find a suitable build system host arch.
for _ohbsa_bs_arch in $(cat '@@ARCHTABDIR@@/'"${_ohbsa_arch}/${_ohbsa_system}")
do