diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-03-14 13:58:54 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2019-04-04 16:08:11 +0000 |
| commit | 05b114e5265722e970cb894ed6c3aa3026c0d04d (patch) | |
| tree | 4f8b97ee38e06c6dfb7117be84dd6e8544b84fbc /Android.mk | |
| parent | 593614f4d47fbc8aadec6930d7c7c417c46bbd85 (diff) | |
simplify LLVM version string printing
Figure it out once in the build system, then just use that all over the place.
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 1bd7db44933..8662bfb76bb 100644 --- a/Android.mk +++ b/Android.mk @@ -97,13 +97,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_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -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_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -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_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -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_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING="3.9")) \ $(eval LOCAL_SHARED_LIBRARIES += libLLVM) endef |