From 06f10d13685b2ebcd5f93cccc4ea6a5ae7dbd48b Mon Sep 17 00:00:00 2001
From: orbea <ovariegata@yahoo.com>
Date: Tue, 21 Nov 2017 08:42:48 -0800
Subject: [PATCH 1/2] qb: Clean up qb.comp.sh

---
 qb/qb.comp.sh | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh
index eaec4be124..f99c1fc124 100644
--- a/qb/qb.comp.sh
+++ b/qb/qb.comp.sh
@@ -14,12 +14,17 @@ cc_works=0
 if [ "$CC" ]; then
 	"$CC" -o "$TEMP_EXE" "$TEMP_C" >/dev/null 2>&1 && cc_works=1
 else
-	for CC in $(exists ${CROSS_COMPILE}gcc ${CROSS_COMPILE}cc ${CROSS_COMPILE}clang) ''; do
-		"$CC" -o "$TEMP_EXE" "$TEMP_C" >/dev/null 2>&1 && cc_works=1 && break
+	for cc in gcc cc clang; do
+		CC="$(exists "${CROSS_COMPILE}${cc}")" || CC=""
+		if [ "$CC" ]; then
+			"$CC" -o "$TEMP_EXE" "$TEMP_C" >/dev/null 2>&1 && {
+				cc_works=1; break
+			}
+		fi
 	done
 fi
 
-rm -f "$TEMP_C" "$TEMP_EXE"
+rm -f -- "$TEMP_C" "$TEMP_EXE"
 
 cc_status='does not work'
 if [ "$cc_works" = '1' ]; then
@@ -44,12 +49,17 @@ cxx_works=0
 if [ "$CXX" ]; then
 	"$CXX" -o "$TEMP_EXE" "$TEMP_CXX" >/dev/null 2>&1 && cxx_works=1
 else
-	for CXX in $(exists ${CROSS_COMPILE}g++ ${CROSS_COMPILE}c++ ${CROSS_COMPILE}clang++) ''; do
-		"$CXX" -o "$TEMP_EXE" "$TEMP_CXX" >/dev/null 2>&1 && cxx_works=1 && break
+	for cxx in g++ c++ clang++; do
+		CXX="$(exists "${CROSS_COMPILE}${cxx}")" || CXX=""
+		if [ "$CXX" ]; then
+			"$CXX" -o "$TEMP_EXE" "$TEMP_CXX" >/dev/null 2>&1 && {
+				cxx_works=1; break
+			}
+		fi
 	done
 fi
 
-rm -f "$TEMP_CXX" "$TEMP_EXE"
+rm -f -- "$TEMP_CXX" "$TEMP_EXE"
 
 cxx_status='does not work'
 if [ "$cxx_works" = '1' ]; then
@@ -67,23 +77,22 @@ fi
 if [ "$OS" = "Win32" ]; then
 	echobuf="Checking for windres"
 	if [ -z "$WINDRES" ]; then
-		WINDRES=$(exists ${CROSS_COMPILE}windres)
-		[ "$WINDRES" ] || die 1 "$echobuf ... Not found. Exiting."
+		WINDRES="$(exists "${CROSS_COMPILE}windres")" || WINDRES=""
+		[ -z "$WINDRES" ] && die 1 "$echobuf ... Not found. Exiting."
 	fi
 	echo "$echobuf ... $WINDRES"
 fi
 
-[ -n "$PKG_CONF_PATH" ] || {
+if [ -z "$PKG_CONF_PATH" ]; then
 	PKG_CONF_PATH="none"
-
-	for p in $(exists "${CROSS_COMPILE}pkg-config") ''; do
-		[ -n "$p" ] && {
-			PKG_CONF_PATH=$p;
-			break;
+	for pkgconf in pkg-config; do
+		PKGCONF="$(exists "${CROSS_COMPILE}${pkgconf}")" || PKGCONF=""
+		[ "$PKGCONF" ] && {
+			PKG_CONF_PATH="$PKGCONF"
+			break
 		}
 	done
-
-}
+fi
 
 echo "Checking for pkg-config ... $PKG_CONF_PATH"
 

From 51dfbd98b1f7f6b55792e45236c934bcad6e2474 Mon Sep 17 00:00:00 2001
From: orbea <ovariegata@yahoo.com>
Date: Tue, 21 Nov 2017 09:04:55 -0800
Subject: [PATCH 2/2] qb: Prefer pkgconf over the legacy GNU pkg-config.

---
 qb/qb.comp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh
index f99c1fc124..147715443d 100644
--- a/qb/qb.comp.sh
+++ b/qb/qb.comp.sh
@@ -85,7 +85,7 @@ fi
 
 if [ -z "$PKG_CONF_PATH" ]; then
 	PKG_CONF_PATH="none"
-	for pkgconf in pkg-config; do
+	for pkgconf in pkgconf pkg-config; do
 		PKGCONF="$(exists "${CROSS_COMPILE}${pkgconf}")" || PKGCONF=""
 		[ "$PKGCONF" ] && {
 			PKG_CONF_PATH="$PKGCONF"