Mesa (master): meson/scons/android: add LLVM_AVAILABLE binary flag

[GitLab Mirror]

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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Aug 28 00:56:24 2019 +0100

meson/scons/android: add LLVM_AVAILABLE binary flag

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

---

 Android.mk    | 8 ++++----
 meson.build   | 1 +
 scons/llvm.py | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index e86c9bd510a..b9d83e87f86 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,13 +98,13 @@ define mesa-build-with-llvm
   $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \
     $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
   $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_STRING=\"3.7\")) \
+    $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_STRING=\"3.7\")) \
   $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_STRING=\"3.8\")) \
+    $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_STRING=\"3.8\")) \
   $(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
+    $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
   $(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
+    $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
   $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
 endef
 
diff --git a/meson.build b/meson.build
index 501957e35e1..e3c96039afb 100644
--- a/meson.build
+++ b/meson.build
@@ -1275,6 +1275,7 @@ endif
 if with_llvm
   _llvm_version = dep_llvm.version().split('.')
   pre_args += [
+    '-DLLVM_AVAILABLE',
     '-DHAVE_LLVM=0x0 at 0@0 at 1@'.format(_llvm_version[0], _llvm_version[1]),
     '-DMESA_LLVM_VERSION_STRING="@0@"'.format(dep_llvm.version()),
   ]
diff --git a/scons/llvm.py b/scons/llvm.py
index 19773eaa999..4bb03872f96 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -288,6 +288,7 @@ def generate(env):
     llvm_version_minor = int(llvm_version.version[1])
     llvm_version_hex = '0x%02x%02x' % (llvm_version_major, llvm_version_minor)
     env.Prepend(CPPDEFINES = [('HAVE_LLVM', llvm_version_hex)])
+    env.Prepend(CPPDEFINES = [('LLVM_AVAILABLE', 1)])
     env.Prepend(CPPDEFINES = [('MESA_LLVM_VERSION_STRING=\\"%s\\"' % llvm_version)])
 
 def exists(env):