Add cdt_arch and cdt_name as used variables (#5599)

* Add cdt_arch and cdt_name as used variables * add news * Update news/5599-cdt-used-vars.rst * Update news/5599-cdt-used-vars.rst --------- Co-authored-by: Matthew R. Becker <[email protected]> Co-authored-by: Jannis Leidel <[email protected]>
conda · Jan 24, 2025 · f24c228 · f24c228
1 parent 8df6493
commit f24c228
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 0 deletions.
diff --git a/conda_build/variants.py b/conda_build/variants.py
@@ -741,6 +741,11 @@ def find_used_variables_in_text(variant, recipe_text, selectors_only=False):
             variant_lines = [
                 line for line in recipe_lines if v in line or target_lang in line
             ]
+        elif v.startswith("cdt_"):
+            variant_lines = [
+                line for line in recipe_lines if v in line or "cdt(" in line
+            ]
+            all_res.append(r"\{{\s*cdt\(")
         else:
             variant_lines = [
                 line for line in recipe_lines if v in line.replace("-", "_")

diff --git a/news/5599-cdt-used-vars.rst b/news/5599-cdt-used-vars.rst
@@ -0,0 +1,19 @@
+### Enhancements
+
+* Add `cdt_arch` and `cdt_name` as used vars when cdt jinja is used. (#5599)
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>
diff --git a/tests/test-recipes/variants/19_used_variables/conda_build_config.yaml b/tests/test-recipes/variants/19_used_variables/conda_build_config.yaml
@@ -11,6 +11,10 @@ pthread_stubs:
 some_package:
   - mooo
   - llama
+cdt_name:
+  - cos6
+cdt_arch:
+  - baz
 # not directly used, but is "used" by virtue of being zipped
 zipped_var:
   - chicken

diff --git a/tests/test-recipes/variants/19_used_variables/meta.yaml b/tests/test-recipes/variants/19_used_variables/meta.yaml
@@ -13,6 +13,8 @@ requirements:
     - zlib
     # an implicit usage containing a dash
     - pthread-stubs
+    # cdts
+    - {{ cdt('foo') }}   # [linux]
   run:
     # python is only "used" if it's used in build and run - see above
     - python
diff --git a/tests/test_variants.py b/tests/test_variants.py
@@ -424,6 +424,8 @@ def test_get_used_loop_vars():
         "zlib",
         "pthread_stubs",
         "target_platform",
+        "cdt_name",
+        "cdt_arch",
     }