diff options
Diffstat (limited to 'llvm/tools/llvm-go/llvm-go.go')
| -rw-r--r-- | llvm/tools/llvm-go/llvm-go.go | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/llvm/tools/llvm-go/llvm-go.go b/llvm/tools/llvm-go/llvm-go.go index 55f20315dedf..c5c3fd244cad 100644 --- a/llvm/tools/llvm-go/llvm-go.go +++ b/llvm/tools/llvm-go/llvm-go.go @@ -162,26 +162,6 @@ func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, l newpath := os.Getenv("PATH") - if llgo != "" { - bindir := filepath.Join(tmpgopath, "bin") - - err = os.MkdirAll(bindir, os.ModePerm) - if err != nil { - panic(err.Error()) - } - - err = os.Symlink(llgo, filepath.Join(bindir, "gccgo")) - if err != nil { - panic(err.Error()) - } - - newpathlist := []string{bindir} - newpathlist = append(newpathlist, filepath.SplitList(newpath)...) - newpath = strings.Join(newpathlist, string(filepath.ListSeparator)) - - args = append([]string{args[0], "-compiler", "gccgo"}, args[1:]...) - } - newgopathlist := []string{tmpgopath} newgopathlist = append(newgopathlist, filepath.SplitList(os.Getenv("GOPATH"))...) newgopath := strings.Join(newgopathlist, string(filepath.ListSeparator)) @@ -197,12 +177,17 @@ func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, l "GOPATH=" + newgopath, "PATH=" + newpath, } + if llgo != "" { + newenv = append(newenv, "GCCGO=" + llgo) + } + for _, v := range os.Environ() { if !strings.HasPrefix(v, "CC=") && !strings.HasPrefix(v, "CXX=") && !strings.HasPrefix(v, "CGO_CPPFLAGS=") && !strings.HasPrefix(v, "CGO_CXXFLAGS=") && !strings.HasPrefix(v, "CGO_LDFLAGS=") && + !strings.HasPrefix(v, "GCCGO=") && !strings.HasPrefix(v, "GOPATH=") && !strings.HasPrefix(v, "PATH=") { newenv = append(newenv, v) |