|
21 | 21 | function get_compiler_cmd(; cplusplus::Bool=false) |
22 | 22 | cc = get(ENV, "JULIA_CC", nothing) |
23 | 23 | path = nothing |
24 | | - @static if Sys.iswindows() |
25 | | - path = joinpath(LazyArtifacts.artifact"mingw-w64", |
26 | | - "extracted_files", |
27 | | - (Int==Int64 ? "mingw64" : "mingw32"), |
28 | | - "bin", |
29 | | - cplusplus ? "g++.exe" : "gcc.exe") |
30 | | - compiler_cmd = `$path` |
31 | | - end |
32 | 24 | if cc !== nothing |
33 | 25 | compiler_cmd = Cmd(Base.shell_split(cc)) |
34 | 26 | path = nothing |
35 | | - elseif !Sys.iswindows() |
36 | | - compilers_cpp = ("g++", "clang++") |
37 | | - compilers_c = ("gcc", "clang") |
38 | | - found_compiler = false |
39 | | - if cplusplus |
40 | | - for compiler in compilers_cpp |
41 | | - if Sys.which(compiler) !== nothing |
42 | | - compiler_cmd = `$compiler` |
43 | | - found_compiler = true |
44 | | - break |
| 27 | + else |
| 28 | + @static if Sys.iswindows() |
| 29 | + path = joinpath(LazyArtifacts.artifact"mingw-w64", |
| 30 | + "extracted_files", |
| 31 | + (Int==Int64 ? "mingw64" : "mingw32"), |
| 32 | + "bin", |
| 33 | + cplusplus ? "g++.exe" : "gcc.exe") |
| 34 | + compiler_cmd = `$path` |
| 35 | + else |
| 36 | + compilers_cpp = ("g++", "clang++") |
| 37 | + compilers_c = ("gcc", "clang") |
| 38 | + found_compiler = false |
| 39 | + if cplusplus |
| 40 | + for compiler in compilers_cpp |
| 41 | + if Sys.which(compiler) !== nothing |
| 42 | + compiler_cmd = `$compiler` |
| 43 | + found_compiler = true |
| 44 | + break |
| 45 | + end |
45 | 46 | end |
46 | 47 | end |
47 | | - end |
48 | | - if !found_compiler |
49 | | - for compiler in compilers_c |
50 | | - if Sys.which(compiler) !== nothing |
51 | | - compiler_cmd = `$compiler` |
52 | | - found_compiler = true |
53 | | - break |
| 48 | + if !found_compiler |
| 49 | + for compiler in compilers_c |
| 50 | + if Sys.which(compiler) !== nothing |
| 51 | + compiler_cmd = `$compiler` |
| 52 | + found_compiler = true |
| 53 | + break |
| 54 | + end |
54 | 55 | end |
55 | 56 | end |
| 57 | + found_compiler || error("could not find a compiler, looked for ", |
| 58 | + join(((cplusplus ? compilers_cpp : ())..., compilers_c...), ", ", " and ")) |
56 | 59 | end |
57 | | - found_compiler || error("could not find a compiler, looked for ", |
58 | | - join(((cplusplus ? compilers_cpp : ())..., compilers_c...), ", ", " and ")) |
59 | 60 | end |
60 | 61 | if path !== nothing |
61 | 62 | compiler_cmd = addenv(compiler_cmd, "PATH" => string(ENV["PATH"], ";", dirname(path))) |
|
0 commit comments