manjarobuild doesn't use the same chroot for multiliba and x86_64

manjarobuild.in

@@ -10,10 +10,12 @@ tag="${cmd%-build}"
 repo=${tag%-*}
 arch=${tag##*-}
 pacman_conf_arch='default'
+branch="${repo}"
 
 if [ "$arch" == 'multilib' ]; then
 	pacman_conf_arch='multilib'
 	arch='x86_64'
+	repo="${repo}-multilib"
 	base_packages+=(multilib-devel)
 fi
 
@@ -72,7 +74,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	setarch "${arch}" mkmanjaroroot \
 		-C "@pkgdatadir@/pacman-${pacman_conf_arch}.conf" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
-		-b "${repo}" \
+		-b "${branch}" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}" || abort
 else
@@ -80,9 +82,9 @@ else
 		-u \
 		-C "@pkgdatadir@/pacman-${pacman_conf_arch}.conf" \
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
-		-b "${repo}" \
+		-b "${branch}" \
 		"${chroots}/${repo}-${arch}/root" || abort
 fi
 
 msg "Building in chroot for [${repo}] (${arch})..."
-exec setarch "${arch}" makechrootpkg "${makechrootpkg_args[@]}" -r "${chroots}/${repo}-${arch}" -b "${repo}"
+exec setarch "${arch}" makechrootpkg "${makechrootpkg_args[@]}" -r "${chroots}/${repo}-${arch}" -b "${branch}"