From fdffaa4c30a2e03038f52a4b3bf3d04724df307c Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Fri, 03 Feb 2012 07:51:59 -0500 Subject: Fix architecture of platform-dependent packages. --- (limited to 'lib') diff --git a/lib/architecture b/lib/architecture index daf8fff..3e80e82 100644 --- a/lib/architecture +++ b/lib/architecture @@ -63,19 +63,11 @@ oh_get_package_architecture() return 0 fi - # "any". - if [ "${_pkgarch}" = any ]; then + if [ -n "${OH_PLATFORM}" ]; then + echo "${OH_PLATFORM}" + else echo "${OH_ARCH}" - return 0 - fi - - # Target platform. - if [ -n "$(echo "${_pkgarch}" | grep -E '^[^-]+$')" ]; then - echo "${_pkgarch}" - return 0 fi - # Target binary architecture. - echo "${OH_ARCH}" return 0 } -- cgit v0.9.1