Mesa (master): gallium/radeon: fix r600g build if LLVM is disabled

Marek Olšák mareko at kemper.freedesktop.org
Tue Aug 11 17:49:21 UTC 2015


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Aug  8 14:03:54 2015 +0200

gallium/radeon: fix r600g build if LLVM is disabled

MESA_LLVM_VERSION_PATCH is undefined.

Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Tested-by: Benjamin Bellec <b.bellec at gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeon/r600_pipe_common.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index c9b8929..9e68e5f 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -882,10 +882,11 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
 
 	ws->query_info(ws, &rscreen->info);
 
-	if (HAVE_LLVM)
-		snprintf(llvm_string, sizeof(llvm_string),
-			 ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
-			 HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
+#if HAVE_LLVM
+	snprintf(llvm_string, sizeof(llvm_string),
+		 ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
+		 HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
+#endif
 
 	snprintf(rscreen->renderer_string, sizeof(rscreen->renderer_string),
 		 "%s (DRM %i.%i.%i%s)",




More information about the mesa-commit mailing list