summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2017-07-31 17:41:23 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2017-07-31 17:59:10 +0200
commit86d4b46d66b9ddbe90590f1b897f412d9fb16276 (patch)
tree20844a36d94372aaf82f010734744d42391918c2
parentbe5773fa8dfe9255d9abaf5c7d5bbbd2d922da08 (diff)
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.
-rw-r--r--src/amd/Makefile.common.am9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index dff461c35d..d62e9d41cf 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)