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

Merge pull request #65 from clarence-glx/master

Browse Source 
fix flang .mod file conflict issue
This commit is contained in:
Ian A Mason 2022-04-17 09:54:35 -07:00 committed by GitHub
commit 48db30df93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shared/compiler.go
View File

@ -81,10 +81,19 @@ func Compile(args []string, compiler string) (exitCode int) {
var bcObjLinks []bitcodeToObjectLink
var newObjectFiles []string
wg.Add(2)
go execCompile(compilerExecName, pr, &wg, &ok)
go buildAndAttachBitcode(compilerExecName, pr, &bcObjLinks, &newObjectFiles, &wg)
wg.Wait()
if compiler == "flang" {
wg.Add(1)
go execCompile(compilerExecName, pr, &wg, &ok)
wg.Wait();
wg.Add(1);
go buildAndAttachBitcode(compilerExecName, pr, &bcObjLinks, &newObjectFiles, &wg)
wg.Wait()
} else {
wg.Add(2)
go execCompile(compilerExecName, pr, &wg, &ok)
go buildAndAttachBitcode(compilerExecName, pr, &bcObjLinks, &newObjectFiles, &wg)
wg.Wait()
}
//grok the exit code
if !ok {