| From 61729a39f173ecfdc31cb09ede4575f4c6bd481c Mon Sep 17 00:00:00 2001 |
| From: Rob Clark <robdclark@google.com> |
| Date: Mon, 8 Jun 2020 09:09:06 -0700 |
| Subject: [PATCH 1/2] Revert "meson: update llvm dependency logic for meson |
| 0.54.0" |
| |
| This reverts commit 8d13ea15710f90485f1fec915e3ed0d5a4aecf5b. |
| --- |
| .pick_status.json | 2 +- |
| meson.build | 14 ++++++-------- |
| 2 files changed, 7 insertions(+), 9 deletions(-) |
| |
| diff --git a/.pick_status.json b/.pick_status.json |
| index 60ea7967317..5ff6f169f16 100644 |
| --- a/.pick_status.json |
| +++ b/.pick_status.json |
| @@ -9103,7 +9103,7 @@ |
| "description": "meson: update llvm dependency logic for meson 0.54.0", |
| "nominated": true, |
| "nomination_type": 1, |
| - "resolution": 1, |
| + "resolution": 0, |
| "master_sha": null, |
| "because_sha": "821cf6942a390f5f64d8a2cff9933b24c84f7dc1" |
| }, |
| diff --git a/meson.build b/meson.build |
| index ef4bdc2cb02..ef7a602cb03 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -1389,14 +1389,12 @@ endif |
| _shared_llvm = get_option('shared-llvm') |
| _llvm = get_option('llvm') |
| |
| -# the cmake method can only link statically, so don't attempt to use it if we |
| -# want to link dynamically. Before 0.54.0 meson will try cmake even when shared |
| -# linking is requested, so we need to force the config-tool method to be used |
| -# in that case, but in 0.54.0 meson won't try the cmake method if shared |
| -# linking is requested. |
| -_llvm_method = 'auto' |
| -if meson.version().version_compare('< 0.54.0') and _shared_llvm |
| - _llvm_method = 'config-tool' |
| +# The cmake method will never find libllvm.so|dylib; this is fine for windows |
| +# because llvm doesn't support libllvm.dll |
| +_llvm_method = 'config-tool' |
| +if (meson.version().version_compare('>= 0.51.0') and |
| + host_machine.system() == 'windows') |
| + _llvm_method = 'cmake' |
| endif |
| |
| dep_llvm = null_dep |
| -- |
| 2.26.2 |
| |
