summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--locale/en_US/opkbuild.sh2
-rw-r--r--src/opkbuild.sh15
2 files changed, 14 insertions, 3 deletions
diff --git a/locale/en_US/opkbuild.sh b/locale/en_US/opkbuild.sh
index 5d8446e..c4641a0 100644
--- a/locale/en_US/opkbuild.sh
+++ b/locale/en_US/opkbuild.sh
@@ -60,7 +60,7 @@ msg_opkbuild_cant_make_src_pkg_dir='Can'\''t make data directory for source pack
msg_opkbuild_cant_install_src_pkg_file='Can'\''t install source package file'
msg_opkbuild_cant_rm_src_pkg_data='Can'\''t clean up data directory for source package'
msg_opkbuild_build_arch_stat_header='Build system:'
-msg_opkbuild_arch_stat_arch=' Architecture: %s'
+msg_opkbuild_arch_stat_arch=' Architecture: %s (%s)'
msg_opkbuild_arch_stat_plat=' Platform: %s'
msg_opkbuild_host_arch_stat_header='Host system:'
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index fbda51c..a54b74f 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -227,6 +227,15 @@ EOF
IFS=- read OPK_HOST_ARCH_CPU OPK_HOST_ARCH_KERNEL OPK_HOST_ARCH_LIBS <<EOF
${OPK_HOST_ARCH}
EOF
+
+ {
+ read OPK_BUILD_ARCH_GNU
+ read OPK_BUILD_ARCH_KBUILD
+ } <"$(ob_get_system_path 'archtab' "${OPK_BUILD_ARCH}")"
+ {
+ read OPK_HOST_ARCH_GNU
+ read OPK_HOST_ARCH_KBUILD
+ } <"$(ob_get_system_path 'archtab' "${OPK_HOST_ARCH}")"
}
make_work_area()
@@ -283,10 +292,12 @@ build_source()
print_arch_stats()
{
ob_info "$(ob_get_msg 'build_arch_stat_header')"
- ob_info "$(ob_get_msg 'arch_stat_arch')" "${OPK_BUILD_ARCH}"
+ ob_info "$(ob_get_msg 'arch_stat_arch')" \
+ "${OPK_BUILD_ARCH}" "${OPK_BUILD_ARCH_GNU}"
ob_info "$(ob_get_msg 'arch_stat_plat')" "${OPK_BUILD_PLAT}"
ob_info "$(ob_get_msg 'host_arch_stat_header')"
- ob_info "$(ob_get_msg 'arch_stat_arch')" "${OPK_HOST_ARCH}"
+ ob_info "$(ob_get_msg 'arch_stat_arch')" \
+ "${OPK_HOST_ARCH}" "${OPK_HOST_ARCH_GNU}"
ob_info "$(ob_get_msg 'arch_stat_plat')" "${OPK_HOST_PLAT}"
}