summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAshley Whetter <awhetter.2011@my.bristol.ac.uk>2013-07-12 11:06:38 +0100
committerAllan McRae <allan@archlinux.org>2013-07-22 13:28:52 +1000
commita774e4d5e26f6e88ecf87237449cbbbe21df179f (patch)
tree4d935f18cc318cb8b4beac86e2163bdea2914a83 /scripts
parent9108bfe08093e0c64a1879c4d74df2ad2c26302c (diff)
downloadpacman-a774e4d5e26f6e88ecf87237449cbbbe21df179f.tar.xz
Install makedepends and checkdepends together
Fixes FS#31557 Signed-off-by: Ashley Whetter <awhetter.2011@my.bristol.ac.uk> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 2a391575..06f7c253 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2952,10 +2952,10 @@ else
fi
msg "$(gettext "Checking buildtime dependencies...")"
- resolve_deps ${makedepends[@]} || deperr=1
-
if (( CHECKFUNC )); then
- resolve_deps ${checkdepends[@]} || deperr=1
+ resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1
+ else
+ resolve_deps "${makedepends[@]}" || deperr=1
fi
if (( RMDEPS )); then