Mesa (master): r600: replace binary HAVE_LLVM checks with LLVM_AVAILABLE

[GitLab Mirror]

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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Aug 27 23:58:57 2019 +0100

r600: replace binary HAVE_LLVM checks with LLVM_AVAILABLE

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Acked-by: Michel Dänzer <mdaenzer at redhat.com>

---

 src/gallium/drivers/r600/r600_pipe_common.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index 60d113e75ac..e91356094ff 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -39,11 +39,7 @@
 #include <inttypes.h>
 #include <sys/utsname.h>
 
-#ifndef HAVE_LLVM
-#define HAVE_LLVM 0
-#endif
-
-#if HAVE_LLVM
+#ifdef LLVM_AVAILABLE
 #include <llvm-c/TargetMachine.h>
 #endif
 
@@ -1202,7 +1198,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
 
 	snprintf(rscreen->renderer_string, sizeof(rscreen->renderer_string),
 		 "%s (%sDRM %i.%i.%i%s"
-#if HAVE_LLVM > 0
+#ifdef LLVM_AVAILABLE
 		 ", LLVM " MESA_LLVM_VERSION_STRING
 #endif
 		 ")",