Commit bfbd722
authored
Rollup merge of #148322 - oxidecomputer:ea-flock-illumos, r=ChrisDenton
Enable file locking support in illumos
#132977 introduced an allow-list of targets supporting file locking, but forgot to add illumos to it (which introduced support for it in ~2015). `File::lock` and friends are now stable, and the ecosystem is slowly replacing custom libc calls with the standard library. Crucially, in 1.91 both Cargo and bootstrap switched to `File::lock`, both breaking build directory locking.
This PR enables file locking on illumos. Fixes #146312.2 files changed
+16
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
| |||
227 | 229 | | |
228 | 230 | | |
229 | 231 | | |
| 232 | + | |
230 | 233 | | |
231 | 234 | | |
232 | 235 | | |
| |||
251 | 254 | | |
252 | 255 | | |
253 | 256 | | |
| 257 | + | |
254 | 258 | | |
255 | 259 | | |
256 | 260 | | |
| |||
276 | 280 | | |
277 | 281 | | |
278 | 282 | | |
| 283 | + | |
279 | 284 | | |
280 | 285 | | |
281 | 286 | | |
| |||
298 | 303 | | |
299 | 304 | | |
300 | 305 | | |
| 306 | + | |
301 | 307 | | |
302 | 308 | | |
303 | 309 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1292 | 1292 | | |
1293 | 1293 | | |
1294 | 1294 | | |
| 1295 | + | |
1295 | 1296 | | |
1296 | 1297 | | |
1297 | 1298 | | |
| |||
1316 | 1317 | | |
1317 | 1318 | | |
1318 | 1319 | | |
| 1320 | + | |
1319 | 1321 | | |
1320 | 1322 | | |
1321 | 1323 | | |
| |||
1329 | 1331 | | |
1330 | 1332 | | |
1331 | 1333 | | |
| 1334 | + | |
1332 | 1335 | | |
1333 | 1336 | | |
1334 | 1337 | | |
| |||
1353 | 1356 | | |
1354 | 1357 | | |
1355 | 1358 | | |
| 1359 | + | |
1356 | 1360 | | |
1357 | 1361 | | |
1358 | 1362 | | |
| |||
1366 | 1370 | | |
1367 | 1371 | | |
1368 | 1372 | | |
| 1373 | + | |
1369 | 1374 | | |
1370 | 1375 | | |
1371 | 1376 | | |
| |||
1406 | 1411 | | |
1407 | 1412 | | |
1408 | 1413 | | |
| 1414 | + | |
1409 | 1415 | | |
1410 | 1416 | | |
1411 | 1417 | | |
| |||
1422 | 1428 | | |
1423 | 1429 | | |
1424 | 1430 | | |
| 1431 | + | |
1425 | 1432 | | |
1426 | 1433 | | |
1427 | 1434 | | |
| |||
1462 | 1469 | | |
1463 | 1470 | | |
1464 | 1471 | | |
| 1472 | + | |
1465 | 1473 | | |
1466 | 1474 | | |
1467 | 1475 | | |
| |||
1478 | 1486 | | |
1479 | 1487 | | |
1480 | 1488 | | |
| 1489 | + | |
1481 | 1490 | | |
1482 | 1491 | | |
1483 | 1492 | | |
| |||
1502 | 1511 | | |
1503 | 1512 | | |
1504 | 1513 | | |
| 1514 | + | |
1505 | 1515 | | |
1506 | 1516 | | |
1507 | 1517 | | |
| |||
0 commit comments