From 663c74150ab4ba6d3adc55b0e3f539557a16e352 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Fri, 13 Nov 2015 13:33:23 +1000
Subject: [PATCH] makepkg: merge arch dependent variables after PKGBUILD
 linting

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 scripts/makepkg.sh.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index b46c0dd9..d0ebf42c 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -761,10 +761,6 @@ merge_arch_attrs() {
 
 source_buildfile() {
 	source_safe "$@"
-
-	if (( !SOURCEONLY )); then
-		merge_arch_attrs
-	fi
 }
 
 run_function_safe() {
@@ -2004,8 +2000,15 @@ else
 	source_buildfile "$BUILDFILE"
 fi
 
-# set defaults if they weren't specified in buildfile
 pkgbase=${pkgbase:-${pkgname[0]}}
+
+# check the PKGBUILD for some basic requirements
+lint_pkgbuild || exit 1
+
+if (( !SOURCEONLY )); then
+	merge_arch_attrs
+fi
+
 basever=$(get_full_version)
 
 if [[ $BUILDDIR = "$startdir" ]]; then
@@ -2033,9 +2036,6 @@ if have_function pkgver; then
 	PKGVERFUNC=1
 fi
 
-# check the PKGBUILD for some basic requirements
-lint_pkgbuild || exit 1
-
 # check we have the software required to process the PKGBUILD
 check_software || exit 1