From 9ffc0d09cef7491c6144bee54529a82edaf5c091 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 28 Apr 2014 15:08:44 +0200 Subject: [PATCH] common/hooks: ignore XBPS_ARCH when cross building. --- common/hooks/do-pkg/00-gen-pkg.sh | 2 +- common/hooks/post-pkg/00-register-pkg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh index 0ec8f6e7e48..2522e3ec53a 100644 --- a/common/hooks/do-pkg/00-gen-pkg.sh +++ b/common/hooks/do-pkg/00-gen-pkg.sh @@ -121,7 +121,7 @@ hook() { else arch=$XBPS_MACHINE fi - if [ -z "$noarch" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then + if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then arch=${XBPS_ARCH} fi diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh index 68974c881c4..8bbdf1d3e95 100644 --- a/common/hooks/post-pkg/00-register-pkg.sh +++ b/common/hooks/post-pkg/00-register-pkg.sh @@ -30,7 +30,7 @@ hook() { else arch=$XBPS_MACHINE fi - if [ -z "$noarch" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then + if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then arch=${XBPS_ARCH} fi if [ -n "$nonfree" ]; then