Commit 309e93e
authored
fix(toolchains): correctly register musl/freethreaded toolchains for workspace (#3314)
The musl/freethreaded runtimes weren't being activated when the flags
were set. This was
because the toolchains weren't having `target_settings` set, which means
extra settings,
such as musl/freethreaded-ness were ignored when matching. The net
result is the regular
toolchain, because it's registered earlier, would always match earlier.
To fix, set the target_settings in the toolchain() call. This matches
the bzlmod behavior.
Also update the toolchain resolution tests to verify resolution.
Fixes #32621 parent 852e954 commit 309e93e
File tree
3 files changed
+5
-10
lines changed- python/private
- tests/toolchains/multi_platform_resolution
3 files changed
+5
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
91 | 95 | | |
92 | 96 | | |
93 | 97 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
217 | | - | |
| 217 | + | |
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| |||
Lines changed: 0 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
| |||
141 | 140 | | |
142 | 141 | | |
143 | 142 | | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | 143 | | |
152 | 144 | | |
153 | 145 | | |
| |||
165 | 157 | | |
166 | 158 | | |
167 | 159 | | |
168 | | - | |
169 | 160 | | |
170 | 161 | | |
171 | 162 | | |
| |||
0 commit comments