diff options
| author | Erich Eckner <git@eckner.net> | 2020-09-10 14:53:21 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-10-11 15:04:39 +0200 |
| commit | 11e6a0ee537ba825476891da1b81ed943ef54401 (patch) | |
| tree | f2aab603824649503632823d265a77ac3be007d8 | |
| parent | 22d059ad9181a1a5faf4ef0c11fd84961836ae64 (diff) | |
| download | devtools32-11e6a0ee537ba825476891da1b81ed943ef54401.tar.xz | |
archbuild: allow empty setarch to skip running setarch at all
| -rw-r--r-- | archbuild.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archbuild.in b/archbuild.in index 73796ba..80d149a 100644 --- a/archbuild.in +++ b/archbuild.in @@ -22,6 +22,7 @@ else fi if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${arch}" + [ -z "${set_arch}" ] && unset set_arch else set_arch="${arch}" fi @@ -99,7 +100,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" (umask 0022; mkdir -p "${chroots}/${repo}-${arch}") - setarch "${set_arch}" mkarchroot \ + ${set_arch:+setarch "${set_arch}"} mkarchroot \ -C "${pacman_config}" \ -M "${makepkg_config}" \ ${cache_dir} \ |