summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-08-28 00:58:18 +0100
committerEric Engestrom <eric.engestrom@intel.com>2019-09-06 22:26:29 +0100
commit1b8764638a1a589612df7b1f34bcc04cb7d3d053 (patch)
tree3e3b9db92684a6db989770cb4869be6449675d9f /scons
parent2406b35151c253fc5fb89ddc07dece9fdaa88ca5 (diff)
meson/scons/android: drop now-unused HAVE_LLVM
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Diffstat (limited to 'scons')
-rw-r--r--scons/llvm.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 4bb03872f96..22412d2aee5 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -283,11 +283,7 @@ def generate(env):
print('scons: Found LLVM version %s' % llvm_version)
env['LLVM_VERSION'] = llvm_version
- # Define HAVE_LLVM macro with the major/minor version number (e.g., 0x0206 for 2.6)
- llvm_version_major = int(llvm_version.version[0])
- 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)])
+ # Define LLVM_AVAILABLE macro to guard code blocks, and MESA_LLVM_VERSION_STRING
env.Prepend(CPPDEFINES = [('LLVM_AVAILABLE', 1)])
env.Prepend(CPPDEFINES = [('MESA_LLVM_VERSION_STRING=\\"%s\\"' % llvm_version)])