Update how env vars are set

Author: thatch

src/portable_python/cpython.py

@@ -172,14 +172,17 @@ def c_configure_args(self):
             yield f"-ltcl{version.mm}"
             yield f"-ltk{version.mm}"
 
-        if self.active_module(Zstd):
-            if self.version >= "3.14" and PPG.target.is_macos:
-                # Normally ./configure will autodetect using pkg-config, but
-                # this doesn't typically work on Mac (the pkg-config binary is
-                # in homebrew, which we omit from path) so we have to provide
-                # some hints about how to staticly include it.
-                yield f"LIBZSTD_CFLAGS=-I{self.deps}/include"
-                yield f"LIBZSTD_LIBS={self.deps_lib_dir}/libzstd.a"
+    def xenv_LIBZSTD_CFLAGS(self):
+        if self.version >= "3.14" and PPG.target.is_macos:
+            # Normally ./configure will autodetect using pkg-config, but
+            # this doesn't typically work on Mac (the pkg-config binary is
+            # in homebrew, which we omit from path) so we have to provide
+            # some hints about how to staticly include it.
+            yield f"-I{self.deps}/include"
+
+    def xenv_LIBZSTD_LIBS(self):
+        if self.version >= "3.14" and PPG.target.is_macos:
+            yield f"{self.deps_lib_dir}/libzstd.a"
 
 
     @runez.cached_property

src/portable_python/external/xcpython.py

@@ -430,8 +430,10 @@ def _do_linux_compile(self):
         self.run_make()
         self.run_make("install")
 
+
 class Zstd(ModuleBuilder):
     """
+    Newer compression format present in most 3.14+ builds
     """
 
     m_debian = "!libzstd-dev"
@@ -443,12 +445,14 @@ def auto_select_reason(self):
         if self.setup.python_spec.version >= "3.14":
             if PPG.target.is_macos:
                 return "Required for 3.14 and up"  # Well, "expected" anyway
-            elif not self.resolved_telltale:
+            if not self.resolved_telltale:
                 return "Required for 3.14 and up"
 
     @property
     def url(self):
-        return self.cfg_url(self.version) or f"https://github.com/facebook/zstd/releases/download/v{self.version}/zstd-{self.version}.tar.gz"
+        return (
+            self.cfg_url(self.version) or f"https://github.com/facebook/zstd/releases/download/v{self.version}/zstd-{self.version}.tar.gz"
+        )
 
     @property
     def version(self):