summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Horodniceanu <a.horodniceanu@proton.me>2025-03-11 18:45:52 +0200
committerDylan Baker <dylan@pnwbakers.com>2025-03-11 16:34:19 -0700
commit0be18b0d87bae8655a79958a14e06db5061cf401 (patch)
treed3c98e7462a3736c791af732b184acd415554a8f
parent8689c944515d4401b1bc4dbc75910288aed006c5 (diff)
downloadmeson-0be18b0d87bae8655a79958a14e06db5061cf401.tar.gz
tests: support DC being more than plain dmd or ldc2
Dub is very thorough about what it encodes in a build id even collecting the compiler path. Therefore, if dub is not provided the exact same compiler path that meson got during setup, the dependency would not be found and the test would fail. Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>
-rw-r--r--test cases/d/14 dub with deps/meson.build5
1 files changed, 1 insertions, 4 deletions
diff --git a/test cases/d/14 dub with deps/meson.build b/test cases/d/14 dub with deps/meson.build
index c1acfcb1b..f7fbd0aed 100644
--- a/test cases/d/14 dub with deps/meson.build
+++ b/test cases/d/14 dub with deps/meson.build
@@ -12,12 +12,9 @@ endif
if meson.get_compiler('d').get_id() == 'gcc'
error('MESON_SKIP_TEST: can\'t build dependencies with GDC')
-elif meson.get_compiler('d').get_id() == 'llvm'
- dc = 'ldc2'
-elif meson.get_compiler('d').get_id() == 'dmd'
- dc = 'dmd'
endif
+dc = meson.get_compiler('d').cmd_array()[0]
arch = host_machine.cpu_family()
if host_machine.system() == 'windows'