Skip to content

Commit 62a06d2

Browse files
committed
Change order of environment-pass, so environment can reference it
1 parent 647b509 commit 62a06d2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

cibuildwheel/environment.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,12 @@ def as_dictionary(
124124

125125
return environment
126126

127-
def add(self, name: str, value: str) -> None:
128-
self.assignments.append(EnvironmentAssignmentRaw(name=name, value=value))
127+
def add(self, name: str, value: str, prepend: bool = False) -> None:
128+
assignment = EnvironmentAssignmentRaw(name=name, value=value)
129+
if prepend:
130+
self.assignments.insert(0, assignment)
131+
else:
132+
self.assignments.append(assignment)
129133

130134
def __repr__(self) -> str:
131135
return f"{self.__class__.__name__}({[repr(a) for a in self.assignments]!r})"

cibuildwheel/options.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,9 @@ def build_options(self, identifier: str | None) -> BuildOptions:
530530

531531
# Pass through environment variables
532532
if self.platform == "linux":
533-
for env_var_name in environment_pass:
533+
for env_var_name in reversed(environment_pass):
534534
with contextlib.suppress(KeyError):
535-
environment.add(env_var_name, self.env[env_var_name])
535+
environment.add(env_var_name, self.env[env_var_name], prepend=True)
536536

537537
if dependency_versions == "pinned":
538538
dependency_constraints: None | (

0 commit comments

Comments
 (0)