]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Correctly set env vars up for meson
authorRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 20 Jan 2025 16:44:44 +0000 (17:44 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 28 Jan 2025 13:59:30 +0000 (14:59 +0100)
tasks.py

index 218e53bbde763be5f2972b65e2a4e08f5f899617..df5e58702064ee8a81bdc99dc1625c6534d732f2 100644 (file)
--- 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,