From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgK7e-0008JL-IM for qemu-devel@nongnu.org; Thu, 09 Apr 2015 17:36:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgK7Z-0001SR-I9 for qemu-devel@nongnu.org; Thu, 09 Apr 2015 17:36:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgK7Z-0001S1-AT for qemu-devel@nongnu.org; Thu, 09 Apr 2015 17:36:21 -0400 From: John Snow Date: Thu, 9 Apr 2015 17:36:12 -0400 Message-Id: <1428615372-615-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH] configure: improve multiarch support for pkgconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, John Snow , stefanha@redhat.com, pbonzini@redhat.com This will improve the multi-arch compilation for hosts using gcc. configurations using clang won't see an improvement, but also won't see a regression. Signed-off-by: John Snow --- configure | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configure b/configure index 826d6fd..d27729a 100755 --- a/configure +++ b/configure @@ -1759,6 +1759,20 @@ if ! has "$pkg_config_exe"; then fi ########################################## +# pkg-config multi-arch probe + +if $cc -print-multiarch >/dev/null 2>&1; then + mlibdir=$($cc -print-multiarch $QEMU_CFLAGS) +fi +if test -z "${mlibdir}"; then + mlibdir=$($cc --print-multi-os-directory $QEMU_CFLAGS) +fi + +if [ -n "${mlibdir}" ] && [ -d "/usr/lib/${mlibdir}/pkgconfig" ]; then + export PKG_CONFIG_LIBDIR="/usr/lib/${mlibdir}/pkgconfig" +fi + +########################################## # NPTL probe if test "$linux_user" = "yes"; then -- 2.1.0