Commit 5d0b1db
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 | |
|---|---|---|---|
| |||
1295 | 1295 | | |
1296 | 1296 | | |
1297 | 1297 | | |
| 1298 | + | |
1298 | 1299 | | |
1299 | 1300 | | |
1300 | 1301 | | |
| |||
1319 | 1320 | | |
1320 | 1321 | | |
1321 | 1322 | | |
| 1323 | + | |
1322 | 1324 | | |
1323 | 1325 | | |
1324 | 1326 | | |
| |||
1332 | 1334 | | |
1333 | 1335 | | |
1334 | 1336 | | |
| 1337 | + | |
1335 | 1338 | | |
1336 | 1339 | | |
1337 | 1340 | | |
| |||
1356 | 1359 | | |
1357 | 1360 | | |
1358 | 1361 | | |
| 1362 | + | |
1359 | 1363 | | |
1360 | 1364 | | |
1361 | 1365 | | |
| |||
1369 | 1373 | | |
1370 | 1374 | | |
1371 | 1375 | | |
| 1376 | + | |
1372 | 1377 | | |
1373 | 1378 | | |
1374 | 1379 | | |
| |||
1409 | 1414 | | |
1410 | 1415 | | |
1411 | 1416 | | |
| 1417 | + | |
1412 | 1418 | | |
1413 | 1419 | | |
1414 | 1420 | | |
| |||
1425 | 1431 | | |
1426 | 1432 | | |
1427 | 1433 | | |
| 1434 | + | |
1428 | 1435 | | |
1429 | 1436 | | |
1430 | 1437 | | |
| |||
1465 | 1472 | | |
1466 | 1473 | | |
1467 | 1474 | | |
| 1475 | + | |
1468 | 1476 | | |
1469 | 1477 | | |
1470 | 1478 | | |
| |||
1481 | 1489 | | |
1482 | 1490 | | |
1483 | 1491 | | |
| 1492 | + | |
1484 | 1493 | | |
1485 | 1494 | | |
1486 | 1495 | | |
| |||
1505 | 1514 | | |
1506 | 1515 | | |
1507 | 1516 | | |
| 1517 | + | |
1508 | 1518 | | |
1509 | 1519 | | |
1510 | 1520 | | |
| |||
0 commit comments