meson/scons/android: add LLVM_AVAILABLE binary flag

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

diff --git a/Android.mk b/Android.mk
index e86c9bd510a5519ae59998d0ab3457f14317d76e..b9d83e87f86a6f7c864988f05fdbe1953a6325db 100644 (file)
--- 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 501957e35e1ad3e1fc477fecedfea43e71d5f4e1..e3c96039afb0af995725211b8f88a9a4d2f7e570 100644 (file)
--- 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@0@0@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 19773eaa999918300dbea720c6aa550e2d8b8a69..4bb03872f960895cf95a17e26980d53d215ef6c5 100644 (file)
--- 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):