Commit bbd0e9f
committed
Auto merge of #128611 - ChrisDenton:cygpath, r=<try>
run-make: Only use cygpath if the path looks unixy
`cygpath -w` can mangle paths that are already Windows paths. Therefore only use it if the path looks like a Unix path. Additionally fallback to using the path as given if `cygpath` fails on the assumption that the path is already good or else will be an error when it's actually used.
Tbh, I'm not entirely convinced that `cygpath` is necessary but if it is used then it shouldn't get in the way of using Windows paths.
try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw1 file changed
+2
-14
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | 3 | | |
8 | 4 | | |
9 | 5 | | |
| |||
21 | 17 | | |
22 | 18 | | |
23 | 19 | | |
| 20 | + | |
24 | 21 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 22 | + | |
35 | 23 | | |
0 commit comments