@@ -101,9 +101,11 @@ function run_compiler(cmd::Cmd; cplusplus::Bool=false)
101101 compiler_cmd = Cmd (Base. shell_split (cc))
102102 path = nothing
103103 elseif ! Sys. iswindows ()
104+ compilers_cpp = (" g++" , " clang++" )
105+ compilers_c = (" gcc" , " clang" )
104106 found_compiler = false
105107 if cplusplus
106- for compiler in ( " g++ " , " clang++ " )
108+ for compiler in compilers_cpp
107109 if Sys. which (compiler) != = nothing
108110 compiler_cmd = ` $compiler `
109111 found_compiler = true
@@ -112,7 +114,7 @@ function run_compiler(cmd::Cmd; cplusplus::Bool=false)
112114 end
113115 end
114116 if ! found_compiler
115- for compiler in ( " gcc " , " clang " )
117+ for compiler in compilers_c
116118 if Sys. which (compiler) != = nothing
117119 compiler_cmd = ` $compiler `
118120 found_compiler = true
@@ -123,8 +125,9 @@ function run_compiler(cmd::Cmd; cplusplus::Bool=false)
123125 break
124126 end
125127 end
126- end
127- found_compiler || error (" could not find a compiler, looked for " , join (compilers, " and " ))
128+ end
129+ found_compiler || error (" could not find a compiler, looked for " ,
130+ join (((cplusplus ? compilers_cpp : ()). .. , compilers_c... ), " , " , " and " ))
128131 end
129132 if path != = nothing
130133 compiler_cmd = addenv (compiler_cmd, " PATH" => string (ENV [" PATH" ], " ;" , dirname (path)))
0 commit comments