Mesa (master): ac/common: always build NIR translation
Nicolai Hähnle
nh at kemper.freedesktop.org
Mon Jul 31 15:59:21 UTC 2017
Module: Mesa
Branch: master
Commit: 86d4b46d66b9ddbe90590f1b897f412d9fb16276
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=86d4b46d66b9ddbe90590f1b897f412d9fb16276
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Mon Jul 31 17:41:23 2017 +0200
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.
---
src/amd/Makefile.common.am | 9 ++-------
1 file 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)
More information about the mesa-commit
mailing list