2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8d6a183bcf8..71b0a790dd7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jun  1 00:17:42 UTC 2017
+# Thu Jun  1 10:05:18 UTC 2017
 pkgbase = qt-sdk-raspberry-pi
 	pkgdesc = Qt SDK for the Raspberry Pi 1/2/3
 	pkgver = 5.9.0
-	pkgrel = 6
+	pkgrel = 7
 	url = http://chaos-reins.com/qpi/
 	install = qpi.install
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = qt-sdk-raspberry-pi
 	makedepends = gcc
 	makedepends = gperf
 	makedepends = python
+	depends = qpi-toolchain
 	optdepends = qtcreator: Integrated Raspberry Pi IDE development
 	options = !strip
 	source = git://github.com/sirspudd/mkspecs.git
diff --git a/PKGBUILD b/PKGBUILD
index 0a2946bc7e14..c452b446ed1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -208,7 +208,7 @@ if ${_use_mesa}; then
   _profiled_gpu_fn=qpi-mesa.sh
   _additional_configure_flags="$_additional_configure_flags -gbm -kms"
 else
-  if [[ -f ${__eglpkgconfigpath} ]] || [[ -f ${__glespkgconfigpath} ]] ; then
+  if $_building && ([[ -f ${__eglpkgconfigpath} ]] || [[ -f ${__glespkgconfigpath} ]]); then
     echo "Mesa is about to eat our communal poodle; delete egl.pc and glesv2.pc in your sysroot"
     exit 1
   fi