danog/gllvm
1
0
Fork 0
mirror of https://github.com/danog/gllvm.git synced 2024-11-26 17:14:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace.

Browse Source
This commit is contained in:
Ian A.Mason 2021-06-09 12:16:27 -07:00
parent df36a3bf73
commit 44dfcce1b8
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shared/compiler.go
View File

@ -387,9 +387,9 @@ func GetCompilerExecName(compiler string) string {
return filepath.Join(LLVMToolChainBinDir, compiler)
case "flang":
if LLVMFName != "" {
return filepath.Join(LLVMToolChainBinDir, LLVMCCName)
}
return filepath.Join(LLVMToolChainBinDir, compiler)
return filepath.Join(LLVMToolChainBinDir, LLVMCCName)
}
return filepath.Join(LLVMToolChainBinDir, compiler)
default:
LogError("The compiler %s is not supported by this tool.", compiler)
return ""

2
shared/environment.go
View File

@ -96,7 +96,7 @@ const (
envpath = "LLVM_COMPILER_PATH"
envcc = "LLVM_CC_NAME"
envcxx = "LLVM_CXX_NAME"
envf = "LLVM_F_NAME"
envf = "LLVM_F_NAME"
envar = "LLVM_AR_NAME"
envlnk = "LLVM_LINK_NAME"
envcfg = "WLLVM_CONFIGURE_ONLY"

17
shared/sanity.go
View File

@ -186,15 +186,14 @@ func checkCompilers() bool {
informUser("The CXX compiler %s is:\n\n\t%s\n\n", cxx, extractLine(cxxVersion, 0))
}
f := GetCompilerExecName("flang")
fOK, fVersion, _ := checkExecutable(f, "-v")
if !fOK {
informUser("The Fortran compiler %s was not found or not executable.\nBetter not try using gflang!\n", f)
informUser(explainLLVMCOMPILERPATH)
informUser(explainLLVMFNAME)
} else {
informUser("The Fortran compiler %s is:\n\n\t%s\n\n", f, extractLine(fVersion, 0))
}
fOK, fVersion, _ := checkExecutable(f, "-v")
if !fOK {
informUser("The Fortran compiler %s was not found or not executable.\nBetter not try using gflang!\n", f)
informUser(explainLLVMCOMPILERPATH)
informUser(explainLLVMFNAME)
} else {
informUser("The Fortran compiler %s is:\n\n\t%s\n\n", f, extractLine(fVersion, 0))
}
//FIXME: why "or" rather than "and"? BECAUSE: if you only need CC, not having CXX is not an error.
return ccOK || cxxOK || fOK