diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-04-22 18:54:14 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-04-22 18:56:08 (EDT) |
| commit | 3e64193f946dcb71dc58b0a4e5f5efcbe2fdf538 (patch) | |
| tree | b91912323e2eb51d31a8970750de7d6ffd01167f /lib | |
| parent | 11e83178d6ad679bb6fa60f05216ad7fc19b051c (diff) | |
Use new OH_HOST_* variables in architecture lib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/architecture.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/architecture.sh b/lib/architecture.sh index 79f3dbb..e8ed182 100644 --- a/lib/architecture.sh +++ b/lib/architecture.sh @@ -32,7 +32,7 @@ oh_is_buildable() # Platform. if [ -n "$(echo "${_pkgarch}" | grep -E '^[^-]+$')" ]; then - return [ "${_pkgarch}" = "${OH_PLATFORM}" ] + return [ "${_pkgarch}" = "${OH_HOST_PLATFORM}" ] fi # Tokenize the 3-tuple binary architecture. @@ -41,11 +41,11 @@ ${_pkgarch} EOF # Test each element of the tuple. - [ "${_pkgcpu}" != any -a "${_pkgcpu}" != "${OH_ARCH_CPU}" ] && + [ "${_pkgcpu}" != any -a "${_pkgcpu}" != "${OH_HOST_ARCH_CPU}" ] && return 1 - [ "${_pkgkernel}" != any -a "${_pkgkernel}" != "${OH_ARCH_KERNEL}" ] && + [ "${_pkgkernel}" != any -a "${_pkgkernel}" != "${OH_HOST_ARCH_KERNEL}" ] && return 1 - [ "${_pkglibs}" != any -a "${_pkglibs}" != "${OH_ARCH_LIBS}" ] && + [ "${_pkglibs}" != any -a "${_pkglibs}" != "${OH_HOST_ARCH_LIBS}" ] && return 1 return 0 @@ -61,10 +61,10 @@ oh_get_package_architecture() return 0 fi - if [ -n "${OH_PLATFORM}" ]; then - echo "${OH_PLATFORM}" + if [ -n "${OH_HOST_PLATFORM}" ]; then + echo "${OH_HOST_PLATFORM}" else - echo "${OH_ARCH}" + echo "${OH_HOST_ARCH}" fi return 0 |