From: Peter Levine <plevine457@gmail.com>
Date: Mon, 21 Oct 2019 02:24:55 +0000 (-0400)
Subject: media-libs/vulkan-loader: Fix building x86 with clang
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9fac5992604160c628ff17076bf385424399018;p=gentoo.git

media-libs/vulkan-loader: Fix building x86 with clang

Append -fno-integrated-as to CFLAGS when building with clang and when
ABI is x86 to prevent breakage.

Closes: https://bugs.gentoo.org/698164
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Peter Levine <plevine457@gmail.com>
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
---

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 3de83b75dd73..7b03900c5666 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -21,7 +21,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 fi
 
-inherit python-any-r1 cmake-multilib
+inherit toolchain-funcs python-any-r1 cmake-multilib
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
@@ -40,6 +40,11 @@ DEPEND="${PYTHON_DEPS}
 	)"
 
 multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if [[ tc-is-clang && ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_TESTS=False