diff --git a/common/wrappers/uname.sh b/common/wrappers/uname.sh index 1f1846999eb..723e3c884a4 100644 --- a/common/wrappers/uname.sh +++ b/common/wrappers/uname.sh @@ -1,9 +1,13 @@ #!/bin/sh uname=$(/usr/bin/uname $@) +uname_m=$(/usr/bin/uname -m) +arch=${XBPS_ARCH%-musl} +# if XBPS_ARCH was reseted by `env -i` use original `/usr/bin/uname -m` +: ${arch:=$uname_m} rv=$? echo "$uname" | sed "s/\(^\| \)$(/usr/bin/uname -n)\($\| \)/\1void\2/" | - sed "s/$(/usr/bin/uname -m)/${XBPS_ARCH%-musl}/" + sed "s/$uname_m/$arch/" exit $rv