Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src/archbuild.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-09-10 14:53:21 +0200
committerErich Eckner <git@eckner.net>2022-12-08 12:57:22 +0100
commitd8fc0ceb44fbafbbaf4a3691d686e2609d6340fc (patch)
treeafbc7ebd4f1e2228c93815f020cde5b4b31fa9fb /src/archbuild.in
parentcae74c60744caf7cb5d1f7dd1515bed40bc3f9c8 (diff)
archbuild: allow empty setarch to skip running setarch at all
Diffstat (limited to 'src/archbuild.in')
-rw-r--r--src/archbuild.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/archbuild.in b/src/archbuild.in
index fcb0dd5..a569393 100644
--- a/src/archbuild.in
+++ b/src/archbuild.in
@@ -23,6 +23,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
@@ -92,7 +93,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} \