Mesa (master): radeon: Include radeon_elf_util.c in the list of LLVM_C_FILES v2

Tom Stellard tstellar at kemper.freedesktop.org
Fri Mar 7 23:09:10 UTC 2014


Module: Mesa
Branch: master
Commit: a1b189ac907d16072ac326c8dc41960bfa17fa09
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1b189ac907d16072ac326c8dc41960bfa17fa09

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Fri Mar  7 16:55:48 2014 -0500

radeon: Include radeon_elf_util.c in the list of LLVM_C_FILES v2

This fixes the a build breakage caused by
6974eb907600b9d0176d3158ff0fd30ac3e56a55 on build configurations where
all the following are true:

1. radeonsi is not being built
2. r600g is being built
3. opencl is disabled
4. --enable-r600-llvm-compiler is not being used
5. libelf is not installed

v2:
  - Add $(RADEON_CFLAGS) to libllvmradeon_la_CFLAGS

Tested-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/radeon/Makefile.am      |    1 +
 src/gallium/drivers/radeon/Makefile.sources |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 7971191..b521658 100644
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -17,6 +17,7 @@ noinst_LTLIBRARIES += libllvmradeon.la
 
 libllvmradeon_la_CFLAGS = \
 	$(GALLIUM_DRIVER_CFLAGS) \
+	$(RADEON_CFLAGS) \
 	$(LLVM_CFLAGS)
 
 libllvmradeon_la_SOURCES = \
diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
index 6ebed2c..0062d4b 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -1,6 +1,5 @@
 C_SOURCES := \
 	r600_buffer_common.c \
-	radeon_elf_util.c \
 	r600_pipe_common.c \
         r600_query.c \
 	r600_streamout.c \
@@ -11,6 +10,7 @@ C_SOURCES := \
 	radeon_vce_40_2_2.c
 
 LLVM_C_FILES := \
+	radeon_elf_util.c \
 	radeon_setup_tgsi_llvm.c \
 	radeon_llvm_emit.c \
 	radeon_llvm_util.c




More information about the mesa-commit mailing list