Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archbuild.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-09-10 14:53:21 +0200
committerErich Eckner <git@eckner.net>2021-02-13 14:06:33 +0100
commitf9e251ba0f71a5805923ff2f4cbb2a3e1a14a32e (patch)
treea697323f71e72823518159aa9e49d56356e1bbba /archbuild.in
parent0c4898b50a5091b66ec87b27b2430dc75e1f3d39 (diff)
archbuild: allow empty setarch to skip running setarch at all
Diffstat (limited to 'archbuild.in')
-rw-r--r--archbuild.in3
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} \