summaryrefslogtreecommitdiffstats
path: root/src/amd
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-10-31 11:56:09 +0100
committerNicolai Hähnle <[email protected]>2016-11-03 10:06:24 +0100
commit2ff5df8f5097d25899996ea344d09be5c76de323 (patch)
treeee4f18b3a3b3a2a635b2c95400ca8300e995e50f /src/amd
parent8eabee9ec0c164bd18babfe15311db14040ad337 (diff)
amd/common: build also for gallium drivers
At least when LLVM is used, which is basically always (unless you're only building r600 without OpenCL). Reviewed-by: Dave Airlie <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/amd')
-rw-r--r--src/amd/common/Makefile.am6
-rw-r--r--src/amd/common/Makefile.sources4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/amd/common/Makefile.am b/src/amd/common/Makefile.am
index 788152d850c..bc269abe755 100644
--- a/src/amd/common/Makefile.am
+++ b/src/amd/common/Makefile.am
@@ -49,3 +49,9 @@ AM_CXXFLAGS = \
noinst_LTLIBRARIES = libamd_common.la
libamd_common_la_SOURCES = $(AMD_COMPILER_SOURCES)
+
+# nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
+# radv is built.
+if HAVE_RADEON_VULKAN
+libamd_common_la_SOURCES += $(AMD_NIR_SOURCES)
+endif
diff --git a/src/amd/common/Makefile.sources b/src/amd/common/Makefile.sources
index 380dba08621..0aff73be776 100644
--- a/src/amd/common/Makefile.sources
+++ b/src/amd/common/Makefile.sources
@@ -24,6 +24,8 @@ AMD_COMPILER_SOURCES := \
ac_binary.h \
ac_llvm_helper.cpp \
ac_llvm_util.c \
- ac_llvm_util.h \
+ ac_llvm_util.h
+
+AMD_NIR_SOURCES := \
ac_nir_to_llvm.c \
ac_nir_to_llvm.h