From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 20 Jan 2025 16:44:44 +0000 (+0100)
Subject: dnsdist: Correctly set env vars up for meson
X-Git-Tag: dnsdist-2.0.0-alpha1~128^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c34e19f9d3eb6d3ecfa8dd57020492d627940fa7;p=thirdparty%2Fpdns.git

dnsdist: Correctly set env vars up for meson
---

diff --git a/tasks.py b/tasks.py
index 218e53bbde..df5e587020 100644
--- a/tasks.py
+++ b/tasks.py
@@ -822,13 +822,15 @@ def ci_dnsdist_configure_meson(features, additional_flags, build_dir):
     tools = f'''AR=llvm-ar-{clang_version} RANLIB=llvm-ranlib-{clang_version}''' if is_compiler_clang() else ''
     cflags = " ".join([get_cflags()])
     cxxflags = " ".join([get_cxxflags(), additional_flags])
-    return " ".join([
+    env = " ".join([
         tools,
         f'CFLAGS="{cflags}"',
         f'CXXFLAGS="{cxxflags}"',
         f"CC='{get_c_compiler()}'",
-        f"CXX='{get_cxx_compiler()}'",
-        f'. {repo_home}/.venv/bin/activate && meson setup {build_dir}',
+        f"CXX='{get_cxx_compiler()}'"
+    ])
+    return " ".join([
+        f'. {repo_home}/.venv/bin/activate && {env} meson setup {build_dir}',
         features_set,
         unittests,
         fuzztargets,