From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Mon, 31 Jul 2017 15:41:23 +0000 (+0200)
Subject: ac/common: always build NIR translation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86d4b46d66b9ddbe90590f1b897f412d9fb16276;p=mesa.git

ac/common: always build NIR translation

radeonsi needs it now, and we require LLVM 3.9 anyway.

Fixes a build with radeonsi but not radv.
---

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index dff461c35d4..d62e9d41cf4 100644
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -58,13 +58,8 @@ common_libamd_common_la_SOURCES = \
 	$(AMD_COMMON_FILES) \
 	$(AMD_COMPILER_FILES) \
 	$(AMD_DEBUG_FILES) \
-	$(AMD_GENERATED_FILES)
-
-# nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
-# radv is built.
-if HAVE_RADEON_VULKAN
-common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
-endif
+	$(AMD_GENERATED_FILES) \
+	$(AMD_NIR_FILES)
 endif
 
 common_libamd_common_la_LIBADD = $(LIBELF_LIBS)