common/hooks: ignore XBPS_ARCH when cross building.
This commit is contained in:
parent
ee5214433e
commit
9ffc0d09ce
|
@ -121,7 +121,7 @@ hook() {
|
||||||
else
|
else
|
||||||
arch=$XBPS_MACHINE
|
arch=$XBPS_MACHINE
|
||||||
fi
|
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}
|
arch=${XBPS_ARCH}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ hook() {
|
||||||
else
|
else
|
||||||
arch=$XBPS_MACHINE
|
arch=$XBPS_MACHINE
|
||||||
fi
|
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}
|
arch=${XBPS_ARCH}
|
||||||
fi
|
fi
|
||||||
if [ -n "$nonfree" ]; then
|
if [ -n "$nonfree" ]; then
|
||||||
|
|
Loading…
Reference in New Issue