Inside a package 'arch' is always defined, but 'abi' may not been defined
Fix conversion of abi to arch