From 36a536b814cebae2b63ad4eb1070d1167c519f1e Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 06 Nov 2012 17:57:19 -0500
Subject: Get Autoconf arches from archtab, not environment.

---
(limited to 'lib')

diff --git a/lib/buildsystem/autoconf.sh b/lib/buildsystem/autoconf.sh
index 13370ae..39d26d5 100644
--- a/lib/buildsystem/autoconf.sh
+++ b/lib/buildsystem/autoconf.sh
@@ -27,9 +27,20 @@ _oh_autoconf_can_configure()
 
 _oh_autoconf_configure()
 {
+	_oh_local _ohbsbac_arch_opts
+
 	mkdir -p "${_OH_BUILDSYSTEM_BUILD_DIR}"
 	cd "${_OH_BUILDSYSTEM_BUILD_DIR}"
 
+	_ohbsbac_arch_opts="
+		--build='$(oh_buildsystem_arch "${OPK_BUILD_ARCH}" 'autoconf')'
+		"
+	if [ "${OPK_BUILD_ARCH}" != "${OPK_HOST_ARCH}" ]; then
+		_ohbsbac_arch_opts="${_ohbsbac_arch_opts}
+			--host='$(oh_buildsystem_arch \
+				"${OPK_HOST_ARCH}" 'autoconf')'"
+	fi
+
 	"${_OH_BUILDSYSTEM_SOURCE_DIR}/configure" \
 		--prefix='/usr' \
 		--bindir='${prefix}/bin' \
@@ -41,14 +52,15 @@ _oh_autoconf_configure()
 		--includedir='${prefix}/include' \
 		--infodir='${prefix}/share/info' \
 		--mandir='${prefix}/share/man' \
-		--build="${OPK_BUILD_ARCH_GNU}" \
-		$([ "${OPK_BUILD_ARCH}" != "${OPK_HOST_ARCH}" ] && \
-			printf '%s' "--host=${OPK_HOST_ARCH_GNU}") \
+		${_ohbsbac_arch_opts}
 		--disable-maintainer-mode \
 		--disable-dependency-tracking \
 		"${@}"
 
 	cd "${_OH_BUILDSYSTEM_WORK_AREA}"
+
+	_oh_return 0
+	return ${?}
 }
 
 _oh_autoconf_can_build()
--
cgit v0.9.1